diff options
| author | Josef Bacik <josef@redhat.com> | 2012-05-23 14:13:11 -0400 |
|---|---|---|
| committer | Josef Bacik <josef@redhat.com> | 2012-05-30 10:23:36 -0400 |
| commit | 72ac3c0d7921f943d92d1ef42a549fb52e56817d (patch) | |
| tree | c8825a2b3848f201a2b67b3a2ec0aaf9669f9ed3 /fs/btrfs/delayed-inode.c | |
| parent | cd023e7b17fe86c530475da210b3348421c40e5f (diff) | |
| download | blackbird-op-linux-72ac3c0d7921f943d92d1ef42a549fb52e56817d.tar.gz blackbird-op-linux-72ac3c0d7921f943d92d1ef42a549fb52e56817d.zip | |
Btrfs: convert the inode bit field to use the actual bit operations
Miao pointed this out while I was working on an orphan problem that messing
with a bitfield where different ranges are protected by different locks
doesn't work out right. Turns out we've been doing this forever where we
have different parts of the bit field protected by either no lock at all or
different locks which could cause all sorts of weird problems including the
issue I was hitting. So instead make a runtime_flags thing that we use the
normal bit operations on that are all atomic so we can keep having our
no/different locking for the different flags and then make force_compress
it's own thing so it can be treated normally. Thanks,
Signed-off-by: Josef Bacik <josef@redhat.com>
Diffstat (limited to 'fs/btrfs/delayed-inode.c')
| -rw-r--r-- | fs/btrfs/delayed-inode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c index bcd40c7109fa..c18d0442ae6d 100644 --- a/fs/btrfs/delayed-inode.c +++ b/fs/btrfs/delayed-inode.c @@ -669,8 +669,8 @@ static int btrfs_delayed_inode_reserve_metadata( return ret; } else if (src_rsv == &root->fs_info->delalloc_block_rsv) { spin_lock(&BTRFS_I(inode)->lock); - if (BTRFS_I(inode)->delalloc_meta_reserved) { - BTRFS_I(inode)->delalloc_meta_reserved = 0; + if (test_and_clear_bit(BTRFS_INODE_DELALLOC_META_RESERVED, + &BTRFS_I(inode)->runtime_flags)) { spin_unlock(&BTRFS_I(inode)->lock); release = true; goto migrate; |
