diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2016-09-26 10:37:43 -0700 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2016-09-26 10:37:43 -0700 |
| commit | 734bcf32c23442e81891641ae05e08108a4010d5 (patch) | |
| tree | b41cc318506b0c38ddf404520ba67753f3ab5452 /fs/btrfs/tree-log.c | |
| parent | 551569f25ec07596e144ffbc7911dd631645e63b (diff) | |
| parent | 8d5e93bb8c9c48ee5948f6b1aff0e895381f09e6 (diff) | |
Merge tag 'v4.4.22' into android-4.4.y
This is the 4.4.22 stable release
Change-Id: Id49e3c87d2cacb2fa85d85a17226f718f4a5ac28
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; |