diff options
| author | Josef Bacik <jbacik@fb.com> | 2014-11-06 10:19:54 -0500 |
|---|---|---|
| committer | Luis Henriques <luis.henriques@canonical.com> | 2015-01-05 13:48:51 +0000 |
| commit | acce1ec2eac50bf1a0c041db1df2637053ee2a4f (patch) | |
| tree | 9b101faa67ffacb63751dbe000897661fa0b2dd2 /fs | |
| parent | 97863cb86abba952db4d721de8d8fcb0c16355ba (diff) | |
| download | linux-stable-acce1ec2eac50bf1a0c041db1df2637053ee2a4f.tar.gz linux-stable-acce1ec2eac50bf1a0c041db1df2637053ee2a4f.tar.bz2 linux-stable-acce1ec2eac50bf1a0c041db1df2637053ee2a4f.zip | |
Btrfs: make sure we wait on logged extents when fsycning two subvols
commit 9dba8cf128ef98257ca719722280c9634e7e9dc7 upstream.
If we have two fsync()'s race on different subvols one will do all of its work
to get into the log_tree, wait on it's outstanding IO, and then allow the
log_tree to finish it's commit. The problem is we were just free'ing that
subvols logged extents instead of waiting on them, so whoever lost the race
wouldn't really have their data on disk. Fix this by waiting properly instead
of freeing the logged extents. Thanks,
Signed-off-by: Josef Bacik <jbacik@fb.com>
Signed-off-by: Chris Mason <clm@fb.com>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/btrfs/tree-log.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c index 9e1f2cd5e67a..b190efaf5688 100644 --- a/fs/btrfs/tree-log.c +++ b/fs/btrfs/tree-log.c @@ -2596,9 +2596,9 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans, if (atomic_read(&log_root_tree->log_commit[index2])) { blk_finish_plug(&plug); btrfs_wait_marked_extents(log, &log->dirty_log_pages, mark); + btrfs_wait_logged_extents(log, log_transid); wait_log_commit(trans, log_root_tree, root_log_ctx.log_transid); - btrfs_free_logged_extents(log, log_transid); mutex_unlock(&log_root_tree->log_mutex); ret = root_log_ctx.log_ret; goto out; |