diff options
| author | David S. Miller <davem@davemloft.net> | 2013-03-12 10:52:22 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-03-12 10:52:22 +0100 |
| commit | e5f2ef7ab4690d2e8faaf5fd203c5ecd70c3abaf (patch) | |
| tree | 3558f68717c70a67e18c3274bb17709a353d036f /fs/btrfs/inode.c | |
| parent | Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh... (diff) | |
| parent | bridge: reserve space for IFLA_BRPORT_FAST_LEAVE (diff) | |
| download | linux-e5f2ef7ab4690d2e8faaf5fd203c5ecd70c3abaf.tar.xz linux-e5f2ef7ab4690d2e8faaf5fd203c5ecd70c3abaf.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/intel/e1000e/netdev.c
Minor conflict in e1000e, a line that got fixed in 'net'
has been removed in 'net-next'.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'fs/btrfs/inode.c')
| -rw-r--r-- | fs/btrfs/inode.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index c226daefd65d..d1470adca8f8 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -8502,6 +8502,7 @@ static int __btrfs_prealloc_file_range(struct inode *inode, int mode, struct btrfs_key ins; u64 cur_offset = start; u64 i_size; + u64 cur_bytes; int ret = 0; bool own_trans = true; @@ -8516,8 +8517,9 @@ static int __btrfs_prealloc_file_range(struct inode *inode, int mode, } } - ret = btrfs_reserve_extent(trans, root, - min(num_bytes, 256ULL * 1024 * 1024), + cur_bytes = min(num_bytes, 256ULL * 1024 * 1024); + cur_bytes = max(cur_bytes, min_size); + ret = btrfs_reserve_extent(trans, root, cur_bytes, min_size, 0, *alloc_hint, &ins, 1); if (ret) { if (own_trans) |