diff options
author | Chris Mason <chris.mason@oracle.com> | 2011-04-11 20:46:03 -0400 |
---|---|---|
committer | Chris Mason <chris.mason@oracle.com> | 2011-04-11 20:46:03 -0400 |
commit | 874d0d2633e0f3fe955607c6b04d5fc5325781c4 (patch) | |
tree | a96165f1f13501419af1c88dae146bc1061f8664 /fs/btrfs/transaction.h | |
parent | 507903b81840a70cc6a179d4eb03584ad50e8c5b (diff) | |
parent | 13c5a93e7005d7dae0b6d070d25203593e692d13 (diff) | |
download | blackbird-op-linux-874d0d2633e0f3fe955607c6b04d5fc5325781c4.tar.gz blackbird-op-linux-874d0d2633e0f3fe955607c6b04d5fc5325781c4.zip |
Merge branch 'for-chris' of git://git.kernel.org/pub/scm/linux/kernel/git/josef/btrfs-work into for-linus
Diffstat (limited to 'fs/btrfs/transaction.h')
-rw-r--r-- | fs/btrfs/transaction.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/transaction.h b/fs/btrfs/transaction.h index 229a594cacd5..e441acc6c584 100644 --- a/fs/btrfs/transaction.h +++ b/fs/btrfs/transaction.h @@ -27,11 +27,11 @@ struct btrfs_transaction { * total writers in this transaction, it must be zero before the * transaction can end */ - unsigned long num_writers; + atomic_t num_writers; unsigned long num_joined; int in_commit; - int use_count; + atomic_t use_count; int commit_done; int blocked; struct list_head list; |