summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorDavide Italiano <dccitaliano@gmail.com>2015-04-07 08:09:15 +0300
committerDavid Sterba <dsterba@suse.com>2016-04-04 17:25:28 +0300
commit2a162ce93232eb78124601996744f8eafec845ab (patch)
treeb834d3ea66baeeab145c1c11dd15addf732b567f /fs
parent232cad8413a0bfbd25f11cc19fd13dfd85e1d8ad (diff)
downloadlinux-2a162ce93232eb78124601996744f8eafec845ab.tar.xz
Btrfs: Improve FL_KEEP_SIZE handling in fallocate
- We call inode_size_ok() only if FL_KEEP_SIZE isn't specified. - As an optimisation we can skip the call if (off + len) isn't greater than the current size of the file. This operation is called under the lock so the less work we do, the better. - If we call inode_size_ok() pass to it the correct value rather than a more conservative estimation. Signed-off-by: Davide Italiano <dccitaliano@gmail.com> Reviewed-by: Liu Bo <bo.li.liu@oracle.com> Reviewed-by: David Sterba <dsterba@suse.com> Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/btrfs/file.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index 15a09cb156ce..7af1abda68d0 100644
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -2682,9 +2682,12 @@ static long btrfs_fallocate(struct file *file, int mode,
return ret;
inode_lock(inode);
- ret = inode_newsize_ok(inode, alloc_end);
- if (ret)
- goto out;
+
+ if (!(mode & FALLOC_FL_KEEP_SIZE) && offset + len > inode->i_size) {
+ ret = inode_newsize_ok(inode, offset + len);
+ if (ret)
+ goto out;
+ }
/*
* TODO: Move these two operations after we have checked