Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit bdfeb5a10471530dc93098e7b7663628ec951407

Authored by Linus Torvalds
2 parents 26cdd1f76a 3da5ab5648
Exists in ti-lsk-linux-4.1.y and in 10 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-02.00.01, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04

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()

Showing 1 changed file Side-by-side Diff

... ... @@ -2591,6 +2591,7 @@
2591 2591 }
2592 2592  
2593 2593 if (log_root_tree->log_transid_committed >= root_log_ctx.log_transid) {
  2594 + blk_finish_plug(&plug);
2594 2595 mutex_unlock(&log_root_tree->log_mutex);
2595 2596 ret = root_log_ctx.log_ret;
2596 2597 goto out;