Btrfs: fix some metadata enospc issues
PATCH 1/1 Btrfs: fix some metadata enospc issues
We weren't reserving metadata space for rename, rmdir and unlink, which could cause problems. This patch fixes that problem. Thanks,
Signed-off-by Josef Bacik <[email protected]>
--- fs/btrfs/inode.c | 32 +++++++++++++++++++++++++++----- 1 files changed, 27 insertions(+), 5 deletions(-)
fs/btrfs/inode.c +27 -5
@@ -2474,7 +2474,17 @@ static int btrfs_unlink(struct inode *dir, struct dentry *dentry) root =BTRFS_I (dir)->root; +/* +* 5 items for unlink inode +* 1 for orphan +*/ + ret =btrfs_reserve_metadata_space (root,6 ); +if (ret) +return ret; + trans =btrfs_start_transaction (root,1 ); +if (IS_ERR (trans)) +return PTR_ERR (trans);btrfs_set_trans_block_group (trans, dir);
@@ -2489,6 +2499,7 @@ static int btrfs_unlink(struct inode *dir, struct dentry *dentry) nr = trans->blocks_used;btrfs_end_transaction_throttle (trans, root); +btrfs_unreserve_metadata_space (root,6 );btrfs_btree_balance_dirty (root, nr);return ret; }
@@ -2569,7 +2580,14 @@ static int btrfs_rmdir(struct inode *dir, struct dentry *dentry) inode->i_ino == BTRFS_FIRST_FREE_OBJECTID)return -ENOTEMPTY ; + ret =btrfs_reserve_metadata_space (root,5 ); +if (ret) +return ret; + trans =btrfs_start_transaction (root,1 ); +if (IS_ERR (trans)) +return PTR_ERR (trans); +btrfs_set_trans_block_group (trans, dir);if (unlikely (inode->i_ino ==BTRFS_EMPTY_SUBVOL_DIR_OBJECTID )) {
@@ -2592,6 +2610,7 @@ static int btrfs_rmdir(struct inode *dir, struct dentry *dentry) out: nr = trans->blocks_used; ret =btrfs_end_transaction_throttle (trans, root); +btrfs_unreserve_metadata_space (root,5 );btrfs_btree_balance_dirty (root, nr);if (ret && !err)
@@ -5283,11 +5302,14 @@ static int btrfs_rename(struct inode *old_dir, struct dentry *old_dentry,return -ENOTEMPTY ;/* -* 2 items for dir items -* 1 item for orphan entry -* 1 item for ref +* We want to reserve the absolute worst case amount of items. So if +* both inodes are subvols and we need to unlink them then that would +* require 4 item modifications, but if they are both normal inodes it +* would require 5 item modifications, so we'll assume their normal +* inodes. So 5 * 2 is 10, plus 1 for the new link, so 11 total items +* should cover the worst case number of items we'll modify. */ - ret =btrfs_reserve_metadata_space (root,4 ); + ret =btrfs_reserve_metadata_space (root,11 );if (ret)return ret;
@@ -5403,7 +5425,7 @@ out_fail:if (old_inode->i_ino ==BTRFS_FIRST_FREE_OBJECTID )up_read (&root->fs_info->subvol_sem); -btrfs_unreserve_metadata_space (root,4 ); +btrfs_unreserve_metadata_space (root,11 );return ret; }
Signature · 1 line
1.5.4.3