diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-01-24 14:31:27 +1200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-01-24 14:31:27 +1200 |
| commit | c4e00f1d31c4c83d15162782491689229bd92527 (patch) | |
| tree | afb74a211f177835053cbe26e090b9e48d2c046c /fs/btrfs/transaction.c | |
| parent | 53448a538d149dd9c66d09d4a7b416551d42b608 (diff) | |
| parent | a53f4f8e9c8ebe6c9ee3b34c368913aae9876e22 (diff) | |
| download | linux-c4e00f1d31c4c83d15162782491689229bd92527.tar.gz linux-c4e00f1d31c4c83d15162782491689229bd92527.tar.bz2 linux-c4e00f1d31c4c83d15162782491689229bd92527.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
Pull btrfs fixes from Chris Mason:
"We have a few fixes in my for-linus branch.
Qu Wenruo's batch fix a regression between some our merge window pull
and the inode_cache feature. The rest are smaller bugs"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
btrfs: Don't call btrfs_start_transaction() on frozen fs to avoid deadlock.
btrfs: Fix the bug that fs_info->pending_changes is never cleared.
btrfs: fix state->private cast on 32 bit machines
Btrfs: fix race deleting block group from space_info->ro_bgs list
Btrfs: fix incorrect freeing in scrub_stripe
btrfs: sync ioctl, handle errors after transaction start
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; |