diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-07 11:04:48 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-07 11:04:48 -0800 |
| commit | bdfeb5a10471530dc93098e7b7663628ec951407 (patch) | |
| tree | caade75fc97787cb03833fddcd90b704696686d7 | |
| parent | 26cdd1f76a889a21faa851bcb260782db2c7f0a9 (diff) | |
| parent | 3da5ab56482f322a9736c484db8773899c5c731b (diff) | |
| download | op-kernel-dev-bdfeb5a10471530dc93098e7b7663628ec951407.zip op-kernel-dev-bdfeb5a10471530dc93098e7b7663628ec951407.tar.gz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
Pull btrfs fix from Chris Mason:
"Forrest Liu tracked down a missing blk_finish_plug in the btrfs
logging code. This isn't a new bug, and it's hard to hit. But, it's
safe enough for inclusion now, and in my for-linus branch"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
Btrfs: add missing blk_finish_plug in btrfs_sync_log()
| -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 9a02da1..1a9585d 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; |
