]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
ext4: Don't mark filesystem error if fallocate fails
authorAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Mon, 25 Feb 2008 20:41:35 +0000 (15:41 -0500)
committerTheodore Ts'o <tytso@mit.edu>
Mon, 25 Feb 2008 20:41:35 +0000 (15:41 -0500)
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>
fs/ext4/extents.c

index bcf5d040e328f8522f303d4832bfb3bac2de44ee..9ae6e67090cdfad1bd52a7e7169ba725dea19c82 100644 (file)
@@ -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;