summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Kenton <skenton@ou.edu>2017-01-02 13:25:34 -0500
committerJan Kara <jack@suse.cz>2017-01-03 10:51:45 +0100
commita17f0cb5b9eaf8212b396d2381cf7594cd5315c7 (patch)
tree3efd11d2e382707b81d05d3a8b777b1506b7a587
parent88b50ce3ab5af60c85905784c938a35c967addf4 (diff)
fs/udf: make #ifdef UDF_PREALLOCATE unconditional
Signed-off-by: Steve Kenton <skenton@ou.edu> Signed-off-by: Jan Kara <jack@suse.cz>
-rw-r--r--fs/udf/inode.c2
-rw-r--r--fs/udf/udfdecl.h1
2 files changed, 0 insertions, 3 deletions
diff --git a/fs/udf/inode.c b/fs/udf/inode.c
index 0f3db71753aa..3a5ac2221a88 100644
--- 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 263829ef1873..b608624e7089 100644
--- 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,