diff options
| author | Josef Bacik <josef@toxicpanda.com> | 2020-01-16 19:12:15 -0500 |
|---|---|---|
| committer | Josef Bacik <josef@toxicpanda.com> | 2020-02-14 09:43:06 -0500 |
| commit | e6e9d586df68bceacaab834caf6c20df3530fc0d (patch) | |
| tree | 2b65d17a3bb34d9378b9b771f852e73e197a2ba9 | |
| parent | 45644a3334bfeac13ad76c9d69bbef23bfbf7066 (diff) | |
| download | btrfs-next-e6e9d586df68bceacaab834caf6c20df3530fc0d.tar.gz | |
btrfs: move ino_cache_inode dropping
We are going to make root life be controlled soley by refcounting, and
inodes will be one of the things that hold a ref on the root. This
means we need to handle dropping the ino_cache_inode outside of the root
freeing logic, so move it into btrfs_drop_and_free_fs_root() so it is
cleaned up properly on unmount.
Signed-off-by: Josef Bacik <josef@toxicpanda.com>
| -rw-r--r-- | fs/btrfs/disk-io.c | 5 | ||||
| -rw-r--r-- | fs/btrfs/transaction.c | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 2a237aecc6d7cd..b7d6b4436f7d63 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -3904,12 +3904,15 @@ void btrfs_drop_and_free_fs_root(struct btrfs_fs_info *fs_info, __btrfs_remove_free_space_cache(root->free_ino_pinned); if (root->free_ino_ctl) __btrfs_remove_free_space_cache(root->free_ino_ctl); + if (root->ino_cache_inode) { + iput(root->ino_cache_inode); + root->ino_cache_inode = NULL; + } btrfs_free_fs_root(root); } void btrfs_free_fs_root(struct btrfs_root *root) { - iput(root->ino_cache_inode); WARN_ON(!RB_EMPTY_ROOT(&root->inode_tree)); if (root->anon_dev) free_anon_bdev(root->anon_dev); diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c index c2fff16842acbf..3ffeb9a2c6e639 100644 --- a/fs/btrfs/transaction.c +++ b/fs/btrfs/transaction.c @@ -2433,6 +2433,10 @@ int btrfs_clean_one_deleted_snapshot(struct btrfs_root *root) btrfs_debug(fs_info, "cleaner removing %llu", root->root_key.objectid); btrfs_kill_all_delayed_nodes(root); + if (root->ino_cache_inode) { + iput(root->ino_cache_inode); + root->ino_cache_inode = NULL; + } if (btrfs_header_backref_rev(root->node) < BTRFS_MIXED_BACKREF_REV) |