diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2014-04-13 04:53:53 +0200 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2014-04-13 04:53:53 +0200 |
| commit | 40c406c74eb9eed58ae7d4d12a0197f7279c9499 (patch) | |
| tree | 157b73fd979f8a95d0f15d0ca721113fdd21b66d /fs | |
| parent | ext4: fix byte order problems introduced by the COLLAPSE_RANGE patches (diff) | |
| download | linux-40c406c74eb9eed58ae7d4d12a0197f7279c9499.tar.xz linux-40c406c74eb9eed58ae7d4d12a0197f7279c9499.zip | |
ext4: COLLAPSE_RANGE only works on extent-based files
Unfortunately, we weren't checking to make sure of this the inode was
extent-based before attempt operate on it. Hilarity ensues.
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Cc: Namjae Jeon <namjae.jeon@samsung.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ext4/extents.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c index f24ef8697609..96e0a4bc8faa 100644 --- a/fs/ext4/extents.c +++ b/fs/ext4/extents.c @@ -4878,9 +4878,6 @@ long ext4_fallocate(struct file *file, int mode, loff_t offset, loff_t len) if (mode & FALLOC_FL_PUNCH_HOLE) return ext4_punch_hole(inode, offset, len); - if (mode & FALLOC_FL_COLLAPSE_RANGE) - return ext4_collapse_range(inode, offset, len); - ret = ext4_convert_inline_data(inode); if (ret) return ret; @@ -4892,6 +4889,9 @@ long ext4_fallocate(struct file *file, int mode, loff_t offset, loff_t len) if (!(ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS))) return -EOPNOTSUPP; + if (mode & FALLOC_FL_COLLAPSE_RANGE) + return ext4_collapse_range(inode, offset, len); + if (mode & FALLOC_FL_ZERO_RANGE) return ext4_zero_range(file, offset, len, mode); |