From d20f7437099073129594e122a3791e2206165430 Mon Sep 17 00:00:00 2001 From: Josef Bacik Date: Mon, 7 Jun 2010 18:26:37 +0000 Subject: [PATCH] --- yaml --- r: 200351 b: refs/heads/master c: 836097797236fd727f82ec2f3f376ac41a430876 h: refs/heads/master i: 200349: c1b107202dda346be16b420ab845fede6f0ab336 200347: 15bdf223eb84dd65e9ef18a81c8107023a751407 200343: d36b63e35292774c40695cc44a032fcd5094f69d 200335: 678a113b4c9bb613daaf02e34b2498f13317ad0d 200319: 754f72bbd0a238e6c454b203c2c2682f9b795510 v: v3 --- [refs] | 2 +- trunk/fs/btrfs/inode.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index dc1ba0cd9bfe..ef9830472567 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4a001071d3549f596c7c3736c5dda8a3a4aba9ed +refs/heads/master: 836097797236fd727f82ec2f3f376ac41a430876 diff --git a/trunk/fs/btrfs/inode.c b/trunk/fs/btrfs/inode.c index 2551b8018399..d999c538cdc2 100644 --- a/trunk/fs/btrfs/inode.c +++ b/trunk/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,