fs/udf: make #ifdef UDF_PREALLOCATE unconditional

Signed-off-by: Steve Kenton <[email protected]> Signed-off-by: Jan Kara <[email protected]>
niw · Jan 3, 2017 · a17f0cb · a17f0cb
1 parent 88b50ce
commit a17f0cb
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 3 deletions.
diff --git a/fs/udf/inode.c b/fs/udf/inode.c
@@ -857,14 +857,12 @@ static sector_t inode_getblk(struct inode *inode, sector_t block,
 	 * block */
 	udf_split_extents(inode, &c, offset, newblocknum, laarr, &endnum);
 
-#ifdef UDF_PREALLOCATE
 	/* We preallocate blocks only for regular files. It also makes sense
 	 * for directories but there's a problem when to drop the
 	 * preallocation. We might use some delayed work for that but I feel
 	 * it's overengineering for a filesystem like UDF. */
 	if (S_ISREG(inode->i_mode))
 		udf_prealloc_extents(inode, c, lastblock, laarr, &endnum);
-#endif
 
 	/* merge any continuous blocks in laarr */
 	udf_merge_extents(inode, laarr, &endnum);

diff --git a/fs/udf/udfdecl.h b/fs/udf/udfdecl.h
@@ -15,7 +15,6 @@
 #include "udfend.h"
 #include "udf_i.h"
 
-#define UDF_PREALLOCATE
 #define UDF_DEFAULT_PREALLOC_BLOCKS	8
 
 extern __printf(3, 4) void _udf_err(struct super_block *sb,