From: Davide Italiano <[email protected]> 3.12-stable review patch. If anyone has any objections, please let me know.
=============== commit 280227a75b56ab5d35854f3a77ef74a7ad56a203 upstream fallocate() checks that the file is extent-based and returns EOPNOTSUPP in case is not. Other tasks can convert from and to indirect and extent so it's safe to check only after grabbing the inode mutex. [Nikolay Borisov: Bakported to 3.12.47 - Adjusted context - Add the 'out' label] Signed-off-by: Davide Italiano <[email protected]> Signed-off-by: Theodore Ts'o <[email protected]> Signed-off-by: Nikolay Borisov <[email protected]> Cc: Jan Kara <[email protected]> Signed-off-by: Jiri Slaby <[email protected]> --- fs/ext4/extents.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c index c9830686cbd5..a9d23daa0d6f 100644 --- a/fs/ext4/extents.c +++ b/fs/ext4/extents.c @@ -4634,12 +4634,6 @@ long ext4_fallocate(struct file *file, int mode, loff_t offset, loff_t len) if (ret) return ret; - /* - * currently supporting (pre)allocate mode for extent-based - * files _only_ - */ - if (!(ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS))) - return -EOPNOTSUPP; trace_ext4_fallocate_enter(inode, offset, len, mode); map.m_lblk = offset >> blkbits; @@ -4654,6 +4648,16 @@ long ext4_fallocate(struct file *file, int mode, loff_t offset, loff_t len) */ credits = ext4_chunk_trans_blocks(inode, max_blocks); mutex_lock(&inode->i_mutex); + + /* + * currently supporting (pre)allocate mode for extent-based + * files _only_ + */ + if (!(ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS))) { + ret = -EOPNOTSUPP; + goto out; + } + ret = inode_newsize_ok(inode, (len + offset)); if (ret) { mutex_unlock(&inode->i_mutex); @@ -4714,6 +4718,7 @@ retry: ret = 0; goto retry; } +out: mutex_unlock(&inode->i_mutex); trace_ext4_fallocate_exit(inode, offset, max_blocks, ret > 0 ? ret2 : ret); -- 2.6.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
