From patchwork Mon Feb 26 12:04:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiufei Xue X-Patchwork-Id: 10242131 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id F22BA602DC for ; Mon, 26 Feb 2018 12:04:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DEC6A29F7E for ; Mon, 26 Feb 2018 12:04:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D14FD29F84; Mon, 26 Feb 2018 12:04:55 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 683A429F7E for ; Mon, 26 Feb 2018 12:04:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752777AbeBZMEy (ORCPT ); Mon, 26 Feb 2018 07:04:54 -0500 Received: from out30-133.freemail.mail.aliyun.com ([115.124.30.133]:42781 "EHLO out30-133.freemail.mail.aliyun.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752822AbeBZMEx (ORCPT ); Mon, 26 Feb 2018 07:04:53 -0500 X-Alimail-AntiSpam: AC=PASS; BC=-1|-1; BR=01201311R191e4; CH=green; FP=0|-1|-1|-1|0|-1|-1|-1; HT=e01f04446; MF=jiufei.xue@linux.alibaba.com; NM=1; PH=DS; RN=7; SR=0; TI=SMTPD_---0SyX3lCW_1519646678; Received: from ali-186590e05fa3.local(mailfrom:jiufei.xue@linux.alibaba.com fp:42.120.74.104) by smtp.aliyun-inc.com(127.0.0.1); Mon, 26 Feb 2018 20:04:39 +0800 From: Jiufei Xue Subject: [PATCH 2/4] block: bio_check_eod() needs to consider partition To: hch@lst.de, Shaohua Li , Jens Axboe Cc: linux-block@vger.kernel.org, caspar@linux.alibaba.com, Joseph Qi References: Message-ID: <9827cd58-0044-19a2-6bc1-bc4357ed846d@linux.alibaba.com> Date: Mon, 26 Feb 2018 20:04:38 +0800 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.13; rv:52.0) Gecko/20100101 Thunderbird/52.6.0 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP bio_check_eod() should get the capacity of partiton, not the whole disk. Signed-off-by: Jiufei Xue --- block/blk-core.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/block/blk-core.c b/block/blk-core.c index 6d82c4f..ef6677d 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -2023,7 +2023,7 @@ static blk_qc_t blk_queue_bio(struct request_queue *q, struct bio *bio) return BLK_QC_T_NONE; } -static void handle_bad_sector(struct bio *bio) +static void handle_bad_sector(struct bio *bio, sector_t maxsector) { char b[BDEVNAME_SIZE]; @@ -2031,7 +2031,7 @@ static void handle_bad_sector(struct bio *bio) printk(KERN_INFO "%s: rw=%d, want=%Lu, limit=%Lu\n", bio_devname(bio, b), bio->bi_opf, (unsigned long long)bio_end_sector(bio), - (long long)get_capacity(bio->bi_disk)); + (long long)maxsector); } #ifdef CONFIG_FAIL_MAKE_REQUEST @@ -2131,12 +2131,20 @@ static inline int blk_partition_remap(struct bio *bio) static inline int bio_check_eod(struct bio *bio, unsigned int nr_sectors) { sector_t maxsector; + struct hd_struct *part; if (!nr_sectors) return 0; /* Test device or partition size, when known. */ - maxsector = get_capacity(bio->bi_disk); + rcu_read_lock(); + part = __disk_get_part(bio->bi_disk, bio->bi_partno); + if (part) + maxsector = part_nr_sects_read(part); + else + maxsector = get_capacity(bio->bi_disk); + rcu_read_unlock(); + if (maxsector) { sector_t sector = bio->bi_iter.bi_sector; @@ -2146,7 +2154,7 @@ static inline int bio_check_eod(struct bio *bio, unsigned int nr_sectors) * without checking the size of the device, e.g., when * mounting a device. */ - handle_bad_sector(bio); + handle_bad_sector(bio, maxsector); return 1; } }