Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cb49f577 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
  Btrfs: do some plugging in the submit_bio threads
parents f727a938 211588ad

fs/btrfs/volumes.c

+10 −0
Original line number Diff line number Diff line
@@ -155,6 +155,15 @@ static noinline int run_scheduled_bios(struct btrfs_device *device) 
	unsigned long limit;

	unsigned long last_waited = 0;

	int force_reg = 0;

	struct blk_plug plug;



	/*

	 * this function runs all the bios we've collected for

	 * a particular device.  We don't want to wander off to

	 * another device without first sending all of these down.

	 * So, setup a plug here and finish it off before we return

	 */

	blk_start_plug(&plug);



	bdi = blk_get_backing_dev_info(device->bdev);

	fs_info = device->dev_root->fs_info;
@@ -294,6 +303,7 @@ static noinline int run_scheduled_bios(struct btrfs_device *device) 
	spin_unlock(&device->io_lock);



done:

	blk_finish_plug(&plug);

	return 0;

}