diff options
| author |  Josef Bacik <josef@toxicpanda.com>
| 2021-11-09 10:12:06 -0500 |
|---|---|---|
| committer |  David Sterba <dsterba@suse.com>
| 2022-01-03 15:09:45 +0100 |
| commit | 54230013d41fb6eb231755dfec8615db9dcfb020 (patch) | |
| tree | 892e00575744e71a77b27b6104bcd23fa56fb59c /fs/btrfs/inode.c | |
| parent | btrfs: remove global rsv stealing logic for orphan cleanup (diff) | |
| download | linux-54230013d41fb6eb231755dfec8615db9dcfb020.tar.gz linux-54230013d41fb6eb231755dfec8615db9dcfb020.tar.bz2 linux-54230013d41fb6eb231755dfec8615db9dcfb020.zip | |
btrfs: get rid of root->orphan_cleanup_state
Now that we don't care about the stage of the orphan_cleanup_state,
simply replace it with a bit on ->state to make sure we don't call the
orphan cleanup every time we wander into this root.
Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Signed-off-by: Josef Bacik <josef@toxicpanda.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/inode.c')
| -rw-r--r-- | fs/btrfs/inode.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 0b89704f7e21..b4ef478e0de3 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -3475,7 +3475,7 @@ int btrfs_orphan_cleanup(struct btrfs_root *root) u64 last_objectid = 0; int ret = 0, nr_unlink = 0; - if (cmpxchg(&root->orphan_cleanup_state, 0, ORPHAN_CLEANUP_STARTED)) + if (test_and_set_bit(BTRFS_ROOT_ORPHAN_CLEANUP, &root->state)) return 0; path = btrfs_alloc_path(); @@ -3633,8 +3633,6 @@ int btrfs_orphan_cleanup(struct btrfs_root *root) /* release the path since we're done with it */ btrfs_release_path(path); - root->orphan_cleanup_state = ORPHAN_CLEANUP_DONE; - if (test_bit(BTRFS_ROOT_ORPHAN_ITEM_INSERTED, &root->state)) { trans = btrfs_join_transaction(root); if (!IS_ERR(trans)) |