diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-10-11 23:33:37 +0200 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-10-11 23:33:37 +0200 |
| commit | 16d185eee470cf2dc3e909a59132893abfdd4b11 (patch) | |
| tree | e48bdb15a5e30feb76a3eed812054b836166b2b5 /fs/btrfs/tree-log.c | |
| parent | 0a9cbce798bca52bb3476cb55ce33da27e100f3e (diff) | |
| parent | be2a76aecfc5ed58ddf8925190cc1cfb519bf932 (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Conflicts:
kernel/cpuset.c
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 0e044d7ee721..1415f6d58633 100644 --- a/fs/btrfs/tree-log.c +++ b/fs/btrfs/tree-log.c @@ -2850,6 +2850,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; |