From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: Ming Lei To: Jens Axboe Cc: linux-block@vger.kernel.org, Ming Lei , Rui Salvaterra , stable@vger.kernel.org, Mike Snitzer , Christoph Hellwig , Xiao Ni , Mariusz Dabrowski Subject: [PATCH 1/3] block: make sure discard bio is aligned with logical block size Date: Fri, 26 Oct 2018 14:24:33 +0800 Message-Id: <20181026062435.21398-2-ming.lei@redhat.com> In-Reply-To: <20181026062435.21398-1-ming.lei@redhat.com> References: <20181026062435.21398-1-ming.lei@redhat.com> List-ID: Obviously the created discard bio has to be aligned with logical block size. Fixes: 744889b7cbb56a6 ("block: don't deal with discard limit in blkdev_issue_discard()") Reported-by: Rui Salvaterra Cc: Rui Salvaterra Cc: stable@vger.kernel.org Cc: Mike Snitzer Cc: Christoph Hellwig Cc: Xiao Ni Cc: Mariusz Dabrowski Signed-off-by: Ming Lei --- block/blk-lib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block/blk-lib.c b/block/blk-lib.c index bbd44666f2b5..aa3944946b2f 100644 --- a/block/blk-lib.c +++ b/block/blk-lib.c @@ -59,7 +59,7 @@ int __blkdev_issue_discard(struct block_device *bdev, sector_t sector, if (!req_sects) goto fail; if (req_sects > UINT_MAX >> 9) - req_sects = UINT_MAX >> 9; + req_sects = (UINT_MAX >> 9) & ~bs_mask; end_sect = sector + req_sects; -- 2.9.5