summaryrefslogtreecommitdiff
path: root/fs/ext4
diff options
context:
space:
mode:
authorAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>2008-02-25 15:41:35 -0500
committerTheodore Ts'o <tytso@mit.edu>2008-02-25 15:41:35 -0500
commit2c98615d3b64ce7888cd46cc668023f456daf287 (patch)
tree5fc26fc832d2afa658e706106d6e793a493eef0a /fs/ext4
parentf5ab0d1f8f7df937778c60c3da6f4ef939a54a7b (diff)
downloadlinux-3.10-2c98615d3b64ce7888cd46cc668023f456daf287.tar.gz
linux-3.10-2c98615d3b64ce7888cd46cc668023f456daf287.tar.bz2
linux-3.10-2c98615d3b64ce7888cd46cc668023f456daf287.zip
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: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'fs/ext4')
-rw-r--r--fs/ext4/extents.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
index bcf5d040e32..9ae6e67090c 100644
--- a/fs/ext4/extents.c
+++ b/fs/ext4/extents.c
@@ -2661,13 +2661,14 @@ retry:
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;