diff options
| author | Chris Mason <chris.mason@fusionio.com> | 2013-02-05 19:24:44 -0500 |
|---|---|---|
| committer | Chris Mason <chris.mason@fusionio.com> | 2013-02-05 19:24:44 -0500 |
| commit | 24f8ebe9189c91f1b3ecfaadd27ef0cb7c74907f (patch) | |
| tree | 80856cf81ec5cb377f7d871233dad0f0283a0c97 /fs/btrfs/super.c | |
| parent | 3c911608085bf2d5a0822c418129f96a2a89d1b5 (diff) | |
| parent | 59fe4f41976f6331b695ff049296d082cf621823 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/josef/btrfs-next.git for-chris into for-linus
Diffstat (limited to 'fs/btrfs/super.c')
| -rw-r--r-- | fs/btrfs/super.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index 99545df1b86..d8982e9601d 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c @@ -267,7 +267,7 @@ void __btrfs_abort_transaction(struct btrfs_trans_handle *trans, function, line, errstr); return; } - trans->transaction->aborted = errno; + ACCESS_ONCE(trans->transaction->aborted) = errno; __btrfs_std_error(root->fs_info, function, line, errno, NULL); } /* |