Commit 2a162ce9 authored by Davide Italiano's avatar Davide Italiano Committed by David Sterba

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: default avatarDavide Italiano <dccitaliano@gmail.com>
Reviewed-by: default avatarLiu Bo <bo.li.liu@oracle.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 232cad84
...@@ -2682,9 +2682,12 @@ static long btrfs_fallocate(struct file *file, int mode, ...@@ -2682,9 +2682,12 @@ static long btrfs_fallocate(struct file *file, int mode,
return ret; return ret;
inode_lock(inode); inode_lock(inode);
ret = inode_newsize_ok(inode, alloc_end);
if (!(mode & FALLOC_FL_KEEP_SIZE) && offset + len > inode->i_size) {
ret = inode_newsize_ok(inode, offset + len);
if (ret) if (ret)
goto out; goto out;
}
/* /*
* TODO: Move these two operations after we have checked * TODO: Move these two operations after we have checked
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment