diff options
| author | Greg Kroah-Hartman <[email protected]> | 2013-01-25 21:27:36 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <[email protected]> | 2013-01-25 21:27:36 +0000 |
| commit | 9f9cba810f36d16f4e64477e879a69f6c47b389d (patch) | |
| tree | d787abcbead1439d3f82f0719efe520fd9689f79 /fs/btrfs/super.c | |
| parent | serial: tegra: Fix compilation error (diff) | |
| parent | Linux 3.8-rc5 (diff) | |
| download | kernel-9f9cba810f36d16f4e64477e879a69f6c47b389d.tar.gz kernel-9f9cba810f36d16f4e64477e879a69f6c47b389d.zip | |
Merge 3.8-rc5 into tty-next
This resolves a number of tty driver merge issues found in linux-next
Signed-off-by: Greg Kroah-Hartman <[email protected]>
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 99545df1b86c..d8982e9601d3 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); } /* |