diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-09-21 15:01:57 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-09-21 15:01:57 +0200 |
| commit | 580498a23be1de55be55147eaee20a69249aeb13 (patch) | |
| tree | 345f1a280812bf15969ae7097583b7dd59482636 /fs/btrfs/tree-log.c | |
| parent | 3ec979658e5cc0fab86a42af79a650299e4d7135 (diff) | |
| parent | 7d1e042314619115153a0f6f06e4552c09a50e13 (diff) | |
Merge branch 'linus' into x86/boot, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'fs/btrfs/tree-log.c')
| -rw-r--r-- | fs/btrfs/tree-log.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c index e935035ac034..ef9c55bc7907 100644 --- a/fs/btrfs/tree-log.c +++ b/fs/btrfs/tree-log.c @@ -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; |