commit | b7f3c7d345f72240055efcdf4111fb2e0d01be99 | [log] [tgz] |
---|---|---|
author | Chris Mason <clm@fb.com> | Wed Sep 07 12:55:36 2016 -0700 |
committer | Chris Mason <clm@fb.com> | Wed Sep 07 12:55:36 2016 -0700 |
tree | cc2413ebd485cb60f54c0e2720157c613b3c1fce | |
parent | cbd60aa7cd17d81a434234268c55192862147439 [diff] | |
parent | ce129655c9d9aaa7b3bcc46529db1b36693575ed [diff] |
Merge branch 'for-chris' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus-4.8
diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c index e935035..ef9c55b 100644 --- a/fs/btrfs/tree-log.c +++ b/fs/btrfs/tree-log.c
@@ -2867,6 +2867,7 @@ 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;