On Tue 15-12-15 16:38:22, Bart Van Assche wrote:
> 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.
Argh, good catch. Thanks for fixing this. You can add:
Reviewed-by: Jan Kara <jack@xxxxxxxx>
Honza
>
> Fixes: 2dbe54957636 ("brd: Refuse improperly aligned discard requests")
> Signed-off-by: Bart Van Assche <bart.vanassche@xxxxxxxxxxx>
> Cc: Jan Kara <jack@xxxxxxxx>
> Cc: Christoph Hellwig <hch@xxxxxx>
> Cc: Robert Elliot <elliott@xxxxxx>
> Cc: stable <stable@xxxxxxxxxxxxxxx> # v4.4+
> ---
> drivers/block/brd.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/block/brd.c b/drivers/block/brd.c
> index a5880f4..1914c63 100644
> --- a/drivers/block/brd.c
> +++ b/drivers/block/brd.c
> @@ -338,7 +338,7 @@ static blk_qc_t brd_make_request(struct request_queue *q, struct bio *bio)
>
> 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;
> --
> 2.1.4
>
--
Jan Kara <jack@xxxxxxxx>
SUSE Labs, CR
--
To unsubscribe from this list: send the line "unsubscribe linux-block" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
