diff options
| author | David Sterba <dsterba@suse.com> | 2017-06-15 19:10:03 +0200 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2017-06-20 14:22:42 +0200 |
| commit | fac03c8daeb581e2bc38e5a8c0c6a42cf87cf1c3 (patch) | |
| tree | a6f7828cc438f65698b4341ae84f576fbc853eec /fs/btrfs/transaction.c | |
| parent | 79b4f4c605b76194448315865ebcf6fcb0844fc5 (diff) | |
| download | linux-stable-fac03c8daeb581e2bc38e5a8c0c6a42cf87cf1c3.tar.gz linux-stable-fac03c8daeb581e2bc38e5a8c0c6a42cf87cf1c3.tar.bz2 linux-stable-fac03c8daeb581e2bc38e5a8c0c6a42cf87cf1c3.zip | |
btrfs: move fs_info::fs_frozen to the flags
We can keep the state among the other fs_info flags, there's no reason
why fs_frozen would need to be separate.
Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/transaction.c')
| -rw-r--r-- | fs/btrfs/transaction.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c index ab030fb22530..97e33513b195 100644 --- a/fs/btrfs/transaction.c +++ b/fs/btrfs/transaction.c @@ -2314,7 +2314,8 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans) * it'll result in deadlock about SB_FREEZE_FS. */ if (current != fs_info->transaction_kthread && - current != fs_info->cleaner_kthread && !fs_info->fs_frozen) + current != fs_info->cleaner_kthread && + !test_bit(BTRFS_FS_FROZEN, &fs_info->flags)) btrfs_run_delayed_iputs(fs_info); return ret; |