diff options
| author | Chris Mason <clm@fb.com> | 2016-09-06 05:37:40 -0700 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2016-09-06 05:57:25 -0700 |
| commit | cbd60aa7cd17d81a434234268c55192862147439 (patch) | |
| tree | 437f37495624a848980f35b674bac8898c33ca68 /fs | |
| parent | cb887083d084d74421ae7bb18acca40568da791f (diff) | |
| download | linux-cbd60aa7cd17d81a434234268c55192862147439.tar.bz2 | |
Btrfs: remove root_log_ctx from ctx list before btrfs_sync_log returns
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+
Diffstat (limited to 'fs')
| -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; |