diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-08 09:56:15 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-08 09:56:15 -0800 |
| commit | 23fbe2cdc1de80120cf9ccd478ac57c3a3a0764b (patch) | |
| tree | 4aff32d5f2f6fe2f54028bfd4d1b66fdd2f8d281 | |
| parent | 926af6273fc683cd98cd0ce7bf0d04a02eed6742 (diff) | |
| parent | eeeefd41843218c55a8782a6920f044d9bf6207a (diff) | |
| download | linux-btrfs-23fbe2cdc1de80120cf9ccd478ac57c3a3a0764b.tar.gz | |
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
| -rw-r--r-- | block/blk-lib.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/block/blk-lib.c b/block/blk-lib.c index f8c82a9b401222..ed1e78e24db005 100644 --- a/block/blk-lib.c +++ b/block/blk-lib.c @@ -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); |