summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosef Bacik <josef@redhat.com>2010-11-22 18:55:39 +0000
committerChris Mason <chris.mason@oracle.com>2010-11-27 13:00:07 -0500
commit0ed42a63f3edb144b091d9528401fce95c3c4d8d (patch)
treed98573473d916eecbeb949d45f8ac9b530440080
parent55a61d1d06a3dc443d0db8aaa613365dcb83b98a (diff)
downloadop-kernel-dev-0ed42a63f3edb144b091d9528401fce95c3c4d8d.zip
op-kernel-dev-0ed42a63f3edb144b091d9528401fce95c3c4d8d.tar.gz
Btrfs: make sure new inode size is ok in fallocate
We have been failing xfstest 228 forever, because we don't check to make sure the new inode size is acceptable as far as RLIMIT is concerned. Just check to make sure it's ok to create a inode with this new size and error out if not. With this patch we now pass 228. Signed-off-by: Josef Bacik <josef@redhat.com> Signed-off-by: Chris Mason <chris.mason@oracle.com>
-rw-r--r--fs/btrfs/inode.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 0058fb3..0eeacd9 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -7102,6 +7102,10 @@ static long btrfs_fallocate(struct inode *inode, int mode,
btrfs_wait_ordered_range(inode, alloc_start, alloc_end - alloc_start);
mutex_lock(&inode->i_mutex);
+ ret = inode_newsize_ok(inode, alloc_end);
+ if (ret)
+ goto out;
+
if (alloc_start > inode->i_size) {
ret = btrfs_cont_expand(inode, alloc_start);
if (ret)
OpenPOWER on IntegriCloud