summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorJosef Bacik <josef@redhat.com>2010-06-07 18:26:37 +0000
committerChris Mason <chris.mason@oracle.com>2010-06-11 11:46:12 -0400
commit836097797236fd727f82ec2f3f376ac41a430876 (patch)
tree72481501a21cfa6494e0b9bba89e3a8f783e2074 /fs
parent4a001071d3549f596c7c3736c5dda8a3a4aba9ed (diff)
downloadlinux-3.10-836097797236fd727f82ec2f3f376ac41a430876.tar.gz
linux-3.10-836097797236fd727f82ec2f3f376ac41a430876.tar.bz2
linux-3.10-836097797236fd727f82ec2f3f376ac41a430876.zip
Btrfs: fix fallocate regression
Seems that when btrfs_fallocate was converted to use the new ENOSPC stuff we dropped passing the mode to the function that actually does the preallocation. This breaks anybody who wants to use FALLOC_FL_KEEP_SIZE. Thanks, Signed-off-by: Josef Bacik <josef@redhat.com> Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/btrfs/inode.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 2551b801839..d999c538cdc 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -6893,7 +6893,7 @@ static long btrfs_fallocate(struct inode *inode, int mode,
if (em->block_start == EXTENT_MAP_HOLE ||
(cur_offset >= inode->i_size &&
!test_bit(EXTENT_FLAG_PREALLOC, &em->flags))) {
- ret = btrfs_prealloc_file_range(inode, 0, cur_offset,
+ ret = btrfs_prealloc_file_range(inode, mode, cur_offset,
last_byte - cur_offset,
1 << inode->i_blkbits,
offset + len,