]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
Btrfs: remove root_log_ctx from ctx list before btrfs_sync_log returns
authorChris Mason <clm@fb.com>
Tue, 6 Sep 2016 12:37:40 +0000 (05:37 -0700)
committerChris Mason <clm@fb.com>
Tue, 6 Sep 2016 12:57:25 +0000 (05:57 -0700)
We use a btrfs_log_ctx structure to pass information into the
tree log commit, and get error values out.  It gets added to a per
log-transaction list which we walk when things go bad.

Commit d1433debe added an optimization to skip waiting for the log
commit, but didn't take root_log_ctx out of the list.  This
patch makes sure we remove things before exiting.

Signed-off-by: Chris Mason <clm@fb.com>
Fixes: d1433debe7f4346cf9fc0dafc71c3137d2a97bc4
cc: stable@vger.kernel.org # 3.15+

fs/btrfs/tree-log.c

index e935035ac03435295c6bfcf9fd58c2b4978e65c8..ef9c55bc79074534e826fd30c9e72a0d5036af84 100644 (file)
@@ -2867,6 +2867,7 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans,
 
        if (log_root_tree->log_transid_committed >= root_log_ctx.log_transid) {
                blk_finish_plug(&plug);
+               list_del_init(&root_log_ctx.list);
                mutex_unlock(&log_root_tree->log_mutex);
                ret = root_log_ctx.log_ret;
                goto out;