diff options
author | 2015-02-20 11:54:53 -0800 | |
---|---|---|
committer | 2015-02-20 11:54:53 -0800 | |
commit | 4c971aa78314253cce914ed29e3d90df3326d646 (patch) | |
tree | a9dcf0b1fdc9e1aacff90afb5b3ab79983115dcc /fs/btrfs/tree-log.c | |
parent | Merge branch 'next' into for-linus (diff) | |
parent | Input: psmouse - use IS_ENABLED instead of homegrown code (diff) | |
download | linux-dev-4c971aa78314253cce914ed29e3d90df3326d646.tar.xz linux-dev-4c971aa78314253cce914ed29e3d90df3326d646.zip |
Merge branch 'next' into for-linus
Second round of updates for 3.20.
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 9a02da16f2be..1a9585d4380a 100644 --- a/fs/btrfs/tree-log.c +++ b/fs/btrfs/tree-log.c @@ -2591,6 +2591,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); mutex_unlock(&log_root_tree->log_mutex); ret = root_log_ctx.log_ret; goto out; |