| From 5e4298be45e83ecdffaabb370eea9396889b07f1 Mon Sep 17 00:00:00 2001 |
| From: Bart Van Assche <bart.vanassche@sandisk.com> |
| Date: Tue, 15 Dec 2015 16:38:22 +0100 |
| Subject: brd: Fix discard request processing |
| |
| From: Bart Van Assche <bart.vanassche@sandisk.com> |
| |
| commit 5e4298be45e83ecdffaabb370eea9396889b07f1 upstream. |
| |
| Avoid that discard requests with size => PAGE_SIZE fail with |
| -EIO. Refuse discard requests if the discard size is not a |
| multiple of the page size. |
| |
| Fixes: 2dbe54957636 ("brd: Refuse improperly aligned discard requests") |
| Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com> |
| Reviewed-by: Jan Kara <jack@suse.com> |
| Cc: Christoph Hellwig <hch@lst.de> |
| Cc: Robert Elliot <elliott@hp.com> |
| Signed-off-by: Jens Axboe <axboe@fb.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/block/brd.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/block/brd.c |
| +++ b/drivers/block/brd.c |
| @@ -341,7 +341,7 @@ static blk_qc_t brd_make_request(struct |
| |
| if (unlikely(bio->bi_rw & REQ_DISCARD)) { |
| if (sector & ((PAGE_SIZE >> SECTOR_SHIFT) - 1) || |
| - bio->bi_iter.bi_size & PAGE_MASK) |
| + bio->bi_iter.bi_size & ~PAGE_MASK) |
| goto io_error; |
| discard_from_brd(brd, sector, bio->bi_iter.bi_size); |
| goto out; |
