]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ext4: don't retry file block mapping on bigalloc fs with non-extent file
authorDarrick J. Wong <darrick.wong@oracle.com>
Mon, 22 Jun 2015 01:10:51 +0000 (21:10 -0400)
committerSasha Levin <sasha.levin@oracle.com>
Sun, 5 Jul 2015 14:12:47 +0000 (10:12 -0400)
[ Upstream commit 292db1bc6c105d86111e858859456bcb11f90f91 ]

ext4 isn't willing to map clusters to a non-extent file.  Don't signal
this with an out of space error, since the FS will retry the
allocation (which didn't fail) forever.  Instead, return EUCLEAN so
that the operation will fail immediately all the way back to userspace.

(The fix is either to run e2fsck -E bmap2extent, or to chattr +e the file.)

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Cc: stable@vger.kernel.org
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
fs/ext4/indirect.c

index 5e7af1c69577249441e9de8a662b432447822dfb..11368881477cf7e96165bc3cf3ab11b14b0917bf 100644 (file)
@@ -565,7 +565,7 @@ int ext4_ind_map_blocks(handle_t *handle, struct inode *inode,
                                       EXT4_FEATURE_RO_COMPAT_BIGALLOC)) {
                EXT4_ERROR_INODE(inode, "Can't allocate blocks for "
                                 "non-extent mapped inodes with bigalloc");
-               return -ENOSPC;
+               return -EUCLEAN;
        }
 
        /* Set up for the direct block allocation */