fs/udf: make #ifdef UDF_PREALLOCATE unconditional

Signed-off-by: Steve Kenton <skenton@ou.edu>
Signed-off-by: Jan Kara <jack@suse.cz>

diff --git a/fs/udf/inode.c b/fs/udf/inode.c
index 0f3db71753aa262f9281257263f845c857aba0e9..3a5ac2221a88d1eaa126ef5dbf10790b0e8a35a1 100644 (file)
--- 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
index 263829ef1873644a16ac3340555291a7fc240a4a..b608624e7089d83a71ff79111136a2dfede47ad1 100644 (file)
--- 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,