diff options
author | David Sterba <dsterba@suse.com> | 2017-06-15 13:10:03 -0400 |
---|---|---|
committer | David Sterba <dsterba@suse.com> | 2017-06-20 08:22:42 -0400 |
commit | fac03c8daeb581e2bc38e5a8c0c6a42cf87cf1c3 (patch) | |
tree | a6f7828cc438f65698b4341ae84f576fbc853eec /fs/btrfs/super.c | |
parent | 79b4f4c605b76194448315865ebcf6fcb0844fc5 (diff) |
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/super.c')
-rw-r--r-- | fs/btrfs/super.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index 53d43cd3cace..2100be6ae68e 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c | |||
@@ -2242,7 +2242,7 @@ static int btrfs_freeze(struct super_block *sb) | |||
2242 | struct btrfs_fs_info *fs_info = btrfs_sb(sb); | 2242 | struct btrfs_fs_info *fs_info = btrfs_sb(sb); |
2243 | struct btrfs_root *root = fs_info->tree_root; | 2243 | struct btrfs_root *root = fs_info->tree_root; |
2244 | 2244 | ||
2245 | fs_info->fs_frozen = 1; | 2245 | set_bit(BTRFS_FS_FROZEN, &fs_info->flags); |
2246 | /* | 2246 | /* |
2247 | * We don't need a barrier here, we'll wait for any transaction that | 2247 | * We don't need a barrier here, we'll wait for any transaction that |
2248 | * could be in progress on other threads (and do delayed iputs that | 2248 | * could be in progress on other threads (and do delayed iputs that |
@@ -2261,7 +2261,9 @@ static int btrfs_freeze(struct super_block *sb) | |||
2261 | 2261 | ||
2262 | static int btrfs_unfreeze(struct super_block *sb) | 2262 | static int btrfs_unfreeze(struct super_block *sb) |
2263 | { | 2263 | { |
2264 | btrfs_sb(sb)->fs_frozen = 0; | 2264 | struct btrfs_fs_info *fs_info = btrfs_sb(sb); |
2265 | |||
2266 | clear_bit(BTRFS_FS_FROZEN, &fs_info->flags); | ||
2265 | return 0; | 2267 | return 0; |
2266 | } | 2268 | } |
2267 | 2269 | ||