diff options
| author | Liu Bo <bo.li.liu@oracle.com> | 2015-03-06 13:23:44 +0100 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2015-03-13 21:38:23 +0100 |
| commit | b4924a0fa18d7f69bde3a84521258e7a55828186 (patch) | |
| tree | 6cae8c50aa9733e369e7eddb3f96317b4810ddd1 /fs/btrfs/transaction.c | |
| parent | btrfs: fix sizeof format specifier in btrfs_check_super_valid() (diff) | |
| download | linux-b4924a0fa18d7f69bde3a84521258e7a55828186.tar.xz linux-b4924a0fa18d7f69bde3a84521258e7a55828186.zip | |
Btrfs: catch transaction abortion after waiting for it
This problem is uncovered by a test case: http://patchwork.ozlabs.org/patch/244297.
Fsync() can report success when it actually doesn't. When we
have several threads running fsync() at the same tiem and in one fsync() we
get a transaction abortion due to some problems(in the test case it's disk
failures), and other fsync()s may return successfully which makes userspace
programs think that data is now safely flushed into disk.
It's because that after fsyncs() fail btrfs_sync_log() due to disk failures,
they get to try btrfs_commit_transaction() where it finds that there is
already a transaction being committed, and they'll just call wait_for_commit()
and return. Note that we actually check "trans->aborted" in btrfs_end_transaction,
but it's likely that the error message is still not yet throwed out and only after
wait_for_commit() we're sure whether the transaction is committed successfully.
This add the necessary check and it now passes the test.
Signed-off-by: Liu Bo <bo.li.liu@oracle.com>
Signed-off-by: Chris Mason <clm@fb.com>
Diffstat (limited to 'fs/btrfs/transaction.c')
| -rw-r--r-- | fs/btrfs/transaction.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c index 323c6541d3dc..07b985f2a814 100644 --- a/fs/btrfs/transaction.c +++ b/fs/btrfs/transaction.c @@ -1811,6 +1811,9 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans, wait_for_commit(root, cur_trans); + if (unlikely(cur_trans->aborted)) + ret = cur_trans->aborted; + btrfs_put_transaction(cur_trans); return ret; |