diff options
| author | Josef Bacik <josef@redhat.com> | 2011-08-30 12:34:28 -0400 |
|---|---|---|
| committer | Josef Bacik <josef@redhat.com> | 2011-10-19 15:12:44 -0400 |
| commit | 4a92b1b8d2810db4ea0c34616b94c0b3810fa027 (patch) | |
| tree | dd01cff1987b8178be84f8b750951497b7f525a7 /fs/btrfs/inode.c | |
| parent | d02c9955ded7fc56dd1edc987558b084ccb03eb4 (diff) | |
| download | linux-3.10-4a92b1b8d2810db4ea0c34616b94c0b3810fa027.tar.gz linux-3.10-4a92b1b8d2810db4ea0c34616b94c0b3810fa027.tar.bz2 linux-3.10-4a92b1b8d2810db4ea0c34616b94c0b3810fa027.zip | |
Btrfs: stop passing a trans handle all around the reservation code
The only thing that we need to have a trans handle for is in
reserve_metadata_bytes and thats to know how much flushing we can do. So
instead of passing it around, just check current->journal_info for a
trans_handle so we know if we can commit a transaction to try and free up space
or not. Thanks,
Signed-off-by: Josef Bacik <josef@redhat.com>
Diffstat (limited to 'fs/btrfs/inode.c')
| -rw-r--r-- | fs/btrfs/inode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 78b5ae59ac4..2947e94947b 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -3577,7 +3577,7 @@ void btrfs_evict_inode(struct inode *inode) * doing the truncate. */ while (1) { - ret = btrfs_block_rsv_check(NULL, root, rsv, min_size, 0, 1); + ret = btrfs_block_rsv_check(root, rsv, min_size, 0, 1); if (ret) { printk(KERN_WARNING "Could not get space for a " "delete, will truncate on mount %d\n", ret); @@ -6577,7 +6577,7 @@ static int btrfs_truncate(struct inode *inode) btrfs_add_ordered_operation(trans, root, inode); while (1) { - ret = btrfs_block_rsv_check(trans, root, rsv, min_size, 0, 1); + ret = btrfs_block_rsv_check(root, rsv, min_size, 0, 1); if (ret) { /* * This can only happen with the original transaction we |