diff options
| author | Yan, Zheng <zheng.yan@oracle.com> | 2009-11-12 10:37:02 +0100 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2009-12-17 18:33:33 +0100 |
| commit | 2e4bfab97055aa6acdd0637913bd705c2d6506d6 (patch) | |
| tree | 2c07c3668c8d13ee1e2076d32a728c60eaa8f4ed /fs/btrfs/transaction.c | |
| parent | Btrfs: Avoid orphan inodes cleanup while replaying log (diff) | |
| download | linux-2e4bfab97055aa6acdd0637913bd705c2d6506d6.tar.xz linux-2e4bfab97055aa6acdd0637913bd705c2d6506d6.zip | |
Btrfs: Avoid orphan inodes cleanup during committing transaction
btrfs_lookup_dentry may trigger orphan cleanup, so it's not good
to call it while committing a transaction.
Signed-off-by: Yan Zheng <zheng.yan@oracle.com>
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/transaction.c')
| -rw-r--r-- | fs/btrfs/transaction.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c index b7b22c344b66..728e8fe5d2cc 100644 --- a/fs/btrfs/transaction.c +++ b/fs/btrfs/transaction.c @@ -796,7 +796,6 @@ static noinline int create_pending_snapshot(struct btrfs_trans_handle *trans, memcpy(&pending->root_key, &key, sizeof(key)); fail: kfree(new_root_item); - btrfs_unreserve_metadata_space(root, 6); return ret; } @@ -808,7 +807,6 @@ static noinline int finish_pending_snapshot(struct btrfs_fs_info *fs_info, u64 index = 0; struct btrfs_trans_handle *trans; struct inode *parent_inode; - struct inode *inode; struct btrfs_root *parent_root; parent_inode = pending->dentry->d_parent->d_inode; @@ -840,8 +838,6 @@ static noinline int finish_pending_snapshot(struct btrfs_fs_info *fs_info, BUG_ON(ret); - inode = btrfs_lookup_dentry(parent_inode, pending->dentry); - d_instantiate(pending->dentry, inode); fail: btrfs_end_transaction(trans, fs_info->fs_root); return ret; |