diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-02-04 07:53:17 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-02-04 07:53:17 +0100 |
| commit | 2622e849a1d3d3ef531d1cc33308bb7fd00eee40 (patch) | |
| tree | f2be9d9f08444cb93b3a8f87099fe4ff8ac3cd57 /fs/btrfs/transaction.c | |
| parent | futex: Fix argument handling in futex_lock_pi() calls (diff) | |
| parent | Linux 3.19-rc7 (diff) | |
| download | linux-2622e849a1d3d3ef531d1cc33308bb7fd00eee40.tar.xz linux-2622e849a1d3d3ef531d1cc33308bb7fd00eee40.zip | |
Merge tag 'v3.19-rc7' into locking/core, to refresh the branch before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'fs/btrfs/transaction.c')
| -rw-r--r-- | fs/btrfs/transaction.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c index a605d4e2f2bc..e88b59d13439 100644 --- a/fs/btrfs/transaction.c +++ b/fs/btrfs/transaction.c @@ -2118,7 +2118,7 @@ void btrfs_apply_pending_changes(struct btrfs_fs_info *fs_info) unsigned long prev; unsigned long bit; - prev = cmpxchg(&fs_info->pending_changes, 0, 0); + prev = xchg(&fs_info->pending_changes, 0); if (!prev) return; |