Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a17f0cb5 authored by Steve Kenton's avatar Steve Kenton Committed by Jan Kara
Browse files

fs/udf: make #ifdef UDF_PREALLOCATE unconditional 



Signed-off-by: default avatarSteve Kenton <skenton@ou.edu>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
parent 88b50ce3

fs/udf/inode.c

+0 −2
Original line number Diff line number Diff line
@@ -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);

fs/udf/udfdecl.h

+0 −1
Original line number Diff line number Diff line
@@ -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,