diff options
author | Josef Bacik <jbacik@fb.com> | 2016-09-02 15:40:02 -0400 |
---|---|---|
committer | David Sterba <dsterba@suse.com> | 2016-09-26 11:59:49 -0400 |
commit | afcdd129e05a9210a5d19d4aa6e0afa475fc49e2 (patch) | |
tree | 76ed00c65a4156d82101d02f1de662b374a05e1d /fs/btrfs/inode.c | |
parent | ba8b04c1d4adbc66f3653e3de5bd6c74a9a003bf (diff) |
Btrfs: add a flags field to btrfs_fs_info
We have a lot of random ints in btrfs_fs_info that can be put into flags. This
is mostly equivalent with the exception of how we deal with quota going on or
off, now instead we set a flag when we are turning it on or off and deal with
that appropriately, rather than just having a pending state that the current
quota_enabled gets set to. Thanks,
Signed-off-by: Josef Bacik <jbacik@fb.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, 2 insertions, 2 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 8c63752b0a96..b5e08a903bb3 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c | |||
@@ -3948,7 +3948,7 @@ noinline int btrfs_update_inode(struct btrfs_trans_handle *trans, | |||
3948 | */ | 3948 | */ |
3949 | if (!btrfs_is_free_space_inode(inode) | 3949 | if (!btrfs_is_free_space_inode(inode) |
3950 | && root->root_key.objectid != BTRFS_DATA_RELOC_TREE_OBJECTID | 3950 | && root->root_key.objectid != BTRFS_DATA_RELOC_TREE_OBJECTID |
3951 | && !root->fs_info->log_root_recovering) { | 3951 | && !test_bit(BTRFS_FS_LOG_RECOVERING, &root->fs_info->flags)) { |
3952 | btrfs_update_root_times(trans, root); | 3952 | btrfs_update_root_times(trans, root); |
3953 | 3953 | ||
3954 | ret = btrfs_delayed_update_inode(trans, root, inode); | 3954 | ret = btrfs_delayed_update_inode(trans, root, inode); |
@@ -5235,7 +5235,7 @@ void btrfs_evict_inode(struct inode *inode) | |||
5235 | 5235 | ||
5236 | btrfs_free_io_failure_record(inode, 0, (u64)-1); | 5236 | btrfs_free_io_failure_record(inode, 0, (u64)-1); |
5237 | 5237 | ||
5238 | if (root->fs_info->log_root_recovering) { | 5238 | if (test_bit(BTRFS_FS_LOG_RECOVERING, &root->fs_info->flags)) { |
5239 | BUG_ON(test_bit(BTRFS_INODE_HAS_ORPHAN_ITEM, | 5239 | BUG_ON(test_bit(BTRFS_INODE_HAS_ORPHAN_ITEM, |
5240 | &BTRFS_I(inode)->runtime_flags)); | 5240 | &BTRFS_I(inode)->runtime_flags)); |
5241 | goto no_delete; | 5241 | goto no_delete; |