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

Commit 2c98615d authored by Aneesh Kumar K.V's avatar Aneesh Kumar K.V Committed by Theodore Ts'o
Browse files

ext4: Don't mark filesystem error if fallocate fails 



If we fail to allocate blocks don't call ext4_error. Also don't hide
errors from ext4_get_blocks_wrap

Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
parent f5ab0d1f

fs/ext4/extents.c

+6 −5
Original line number Diff line number Diff line
@@ -2661,13 +2661,14 @@ long ext4_fallocate(struct inode *inode, int mode, loff_t offset, loff_t len) 
		ret = ext4_get_blocks_wrap(handle, inode, block,

					  max_blocks, &map_bh,

					  EXT4_CREATE_UNINITIALIZED_EXT, 0);

		WARN_ON(ret <= 0);

		if (ret <= 0) {

			ext4_error(inode->i_sb, "ext4_fallocate",

				    "ext4_ext_get_blocks returned error: "

				    "inode#%lu, block=%u, max_blocks=%lu",

#ifdef EXT4FS_DEBUG

			WARN_ON(ret <= 0);

			printk(KERN_ERR "%s: ext4_ext_get_blocks "

				    "returned error inode#%lu, block=%u, "

				    "max_blocks=%lu", __func__,

				    inode->i_ino, block, max_blocks);

			ret = -EIO;

#endif

			ext4_mark_inode_dirty(handle, inode);

			ret2 = ext4_journal_stop(handle);

			break;