diff options
| author | Josef Bacik <josef@redhat.com> | 2011-10-14 14:46:51 -0400 |
|---|---|---|
| committer | Josef Bacik <josef@redhat.com> | 2011-10-19 15:12:59 -0400 |
| commit | 3880a1b46d87a6b030c31889875befc745d95dff (patch) | |
| tree | b693669e3a58f39e706bca7f2da8a71211be99de /fs | |
| parent | b24e03db0df3e9164c9649db12fecc8c2d81b0d1 (diff) | |
| download | blackbird-op-linux-3880a1b46d87a6b030c31889875befc745d95dff.tar.gz blackbird-op-linux-3880a1b46d87a6b030c31889875befc745d95dff.zip | |
Btrfs: reserve some space for an orphan item when unlinking
In __unlink_start_trans() if we don't have enough room for a reservation we will
check to see if the unlink will free up space. If it does that's great, but we
will still could add an orphan item, so we need to reserve enough space to add
the orphan item. Do this and migrate the space the global reserve so it all
works out right. Thanks,
Signed-off-by: Josef Bacik <josef@redhat.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/btrfs/inode.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 1f013c5c36aa..b6b70bdd0992 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -2790,7 +2790,8 @@ static struct btrfs_trans_handle *__unlink_start_trans(struct inode *dir, return ERR_PTR(-ENOMEM); } - trans = btrfs_start_transaction(root, 0); + /* 1 for the orphan item */ + trans = btrfs_start_transaction(root, 1); if (IS_ERR(trans)) { btrfs_free_path(path); root->fs_info->enospc_unlink = 0; @@ -2895,6 +2896,12 @@ static struct btrfs_trans_handle *__unlink_start_trans(struct inode *dir, err = 0; out: btrfs_free_path(path); + /* Migrate the orphan reservation over */ + if (!err) + err = btrfs_block_rsv_migrate(trans->block_rsv, + &root->fs_info->global_block_rsv, + btrfs_calc_trans_metadata_size(root, 1)); + if (err) { btrfs_end_transaction(trans, root); root->fs_info->enospc_unlink = 0; |
