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

Commit 23fbe2cd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.dk/linux-block 

Pull block fix from Jens Axboe:
 "A single fix that should go into 4.10, fixing a regression on some
  devices with the WRITE_SAME command"

* 'for-linus' of git://git.kernel.dk/linux-block:
  block: don't try Write Same from __blkdev_issue_zeroout
parents 926af627 eeeefd41

block/blk-lib.c

+4 −5
Original line number Diff line number Diff line
@@ -306,11 +306,6 @@ int __blkdev_issue_zeroout(struct block_device *bdev, sector_t sector, 
	if (ret == 0 || (ret && ret != -EOPNOTSUPP))

		goto out;



	ret = __blkdev_issue_write_same(bdev, sector, nr_sects, gfp_mask,

			ZERO_PAGE(0), biop);

	if (ret == 0 || (ret && ret != -EOPNOTSUPP))

		goto out;



	ret = 0;

	while (nr_sects != 0) {

		bio = next_bio(bio, min(nr_sects, (sector_t)BIO_MAX_PAGES),
@@ -369,6 +364,10 @@ int blkdev_issue_zeroout(struct block_device *bdev, sector_t sector, 
			return 0;

	}



	if (!blkdev_issue_write_same(bdev, sector, nr_sects, gfp_mask,

			ZERO_PAGE(0)))

		return 0;



	blk_start_plug(&plug);

	ret = __blkdev_issue_zeroout(bdev, sector, nr_sects, gfp_mask,

			&bio, discard);