From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 729E7C433EF for ; Fri, 15 Oct 2021 16:05:33 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2D9A5611C3 for ; Fri, 15 Oct 2021 16:05:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 2D9A5611C3 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:In-Reply-To:Content-Type: MIME-Version:References:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=rgGaYmDb8aNvCIAME7GO0birqL1mkWt7ydTyP9O/cKE=; b=FLawV9kPGh6tvfcFqIBEoPV/Fp 7PEW9W/QsAHHik+ummXM309A2rJdBcNlQo8fChwoiYDOiQR8uegVxL2Zn9dcWSibJyBN83sFDi/UH ntUiNfj8/kXydW7D8HCTqBYVj58T0f5RaO38mz1y/dzb/oZgIk2zTq6IffeRt9eccAU3Wmoygu2Vf KHt59aGxWm0fBpuoZDrwn2QDmQ8keqU3x6dO4aJHsmCg2MR/8Ctg8ujRgWogxlatNoh3XUg4CEKvc Q9kOJbcww9dDMobr8NBZQibBcwrB4i8p05udSPEFlXCT0/35AbCY7QmEyWVERCSDKSkAinAgQJAi0 VXcZWJrA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mbPi6-007zaU-O7; Fri, 15 Oct 2021 16:05:30 +0000 Received: from mail-pj1-x1029.google.com ([2607:f8b0:4864:20::1029]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mbPar-007yzL-Fb for linux-nvme@lists.infradead.org; Fri, 15 Oct 2021 15:58:02 +0000 Received: by mail-pj1-x1029.google.com with SMTP id kk10so7507791pjb.1 for ; Fri, 15 Oct 2021 08:58:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=rgGaYmDb8aNvCIAME7GO0birqL1mkWt7ydTyP9O/cKE=; b=kIRUc5W9BEwRakFXurh5nloSfV/GZ6KodZpU7B1gErDYA9VUyCtogTyGs+Y5G+H20i dnc1ZbM+E5Bs4xUGAtigRUSltSsKM9wVuaq9ndK9JOr2Z68iGubgRtUXKZR8iuFZIw97 IrBdRqOJrF7Mv/zRwmHVkacPzOteyiW6Cc+yE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=rgGaYmDb8aNvCIAME7GO0birqL1mkWt7ydTyP9O/cKE=; b=zjOAJDNe5DuumDzLcLhn3IYmNzK9mBgwdy3SXJBOfVnEN8QDqhowVr/4h4cJL0RpeP MBXzettXa84yeKNflDwYiMMDXYnAQ2aG4e7YRV4vfDa8SsraZBCv9gnw0+j8ZVUhT54l ZtImGKHWGEfHAuWqWeBLR63Bocly2Z6InovS+HpzhuIRvfjCwX5XY3vRu4RbeASIbqMR hCU4/tRGCsWPWSr26XkOjhSTLe/oM/GTh90+HO9vKMZEUo7HcpJtv3S6i6n3vc8LQJFq ndAdpUCshd2LL+zHa8NxVqTVFl7Bp36rUUcfmghiTn2U7/ZeutuXZUbNLcRPQRvb/sW3 KQcA== X-Gm-Message-State: AOAM533pGmWgb3rx6Qji6v75+9H3aUgColyZWdWXcYWhx9HhznYlT5Li edrN8XKKoEVonsKu3JLMXHPtGQ== X-Google-Smtp-Source: ABdhPJx303madCzq8aEdsp3YSciE1Wq7LVhGoNPOEW0M7ZYp3QKmvN8DHnOwfgCID2D8+p9KXQEc7Q== X-Received: by 2002:a17:902:b40a:b0:13d:cbcd:2e64 with SMTP id x10-20020a170902b40a00b0013dcbcd2e64mr11832704plr.18.1634313480495; Fri, 15 Oct 2021 08:58:00 -0700 (PDT) Received: from www.outflux.net (smtp.outflux.net. [198.145.64.163]) by smtp.gmail.com with ESMTPSA id i123sm5371745pfg.157.2021.10.15.08.58.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Oct 2021 08:58:00 -0700 (PDT) Date: Fri, 15 Oct 2021 08:57:59 -0700 From: Kees Cook To: Christoph Hellwig Cc: Jens Axboe , Coly Li , Mike Snitzer , Song Liu , David Sterba , Josef Bacik , Theodore Ts'o , OGAWA Hirofumi , Dave Kleikamp , Ryusuke Konishi , Anton Altaparmakov , Konstantin Komarov , Phillip Lougher , Jan Kara , linux-block@vger.kernel.org, dm-devel@redhat.com, drbd-dev@lists.linbit.com, linux-bcache@vger.kernel.org, linux-raid@vger.kernel.org, linux-nvme@lists.infradead.org, linux-scsi@vger.kernel.org, target-devel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-btrfs@vger.kernel.org, linux-ext4@vger.kernel.org, jfs-discussion@lists.sourceforge.net, linux-nfs@vger.kernel.org, linux-nilfs@vger.kernel.org, linux-ntfs-dev@lists.sourceforge.net, ntfs3@lists.linux.dev, reiserfs-devel@vger.kernel.org, Chaitanya Kulkarni Subject: Re: [PATCH 08/30] target/iblock: use bdev_nr_bytes instead of open coding it Message-ID: <202110150857.A7E96DAE@keescook> References: <20211015132643.1621913-1-hch@lst.de> <20211015132643.1621913-9-hch@lst.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20211015132643.1621913-9-hch@lst.de> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211015_085801_562015_2A029BB6 X-CRM114-Status: GOOD ( 20.21 ) X-Mailman-Approved-At: Fri, 15 Oct 2021 09:05:09 -0700 X-BeenThere: linux-nvme@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-nvme" Errors-To: linux-nvme-bounces+linux-nvme=archiver.kernel.org@lists.infradead.org On Fri, Oct 15, 2021 at 03:26:21PM +0200, Christoph Hellwig wrote: > Use the proper helper to read the block device size. > > Signed-off-by: Christoph Hellwig > Reviewed-by: Chaitanya Kulkarni Is this basically an open-coded non-sb version of sb_bdev_nr_blocks()? Reviewed-by: Kees Cook > --- > drivers/target/target_core_iblock.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/target/target_core_iblock.c b/drivers/target/target_core_iblock.c > index 31df20abe141f..b1ef041cacd81 100644 > --- a/drivers/target/target_core_iblock.c > +++ b/drivers/target/target_core_iblock.c > @@ -232,9 +232,9 @@ static unsigned long long iblock_emulate_read_cap_with_block_size( > struct block_device *bd, > struct request_queue *q) > { > - unsigned long long blocks_long = (div_u64(i_size_read(bd->bd_inode), > - bdev_logical_block_size(bd)) - 1); > u32 block_size = bdev_logical_block_size(bd); > + unsigned long long blocks_long = > + div_u64(bdev_nr_bytes(bd), block_size) - 1; > > if (block_size == dev->dev_attrib.block_size) > return blocks_long; > -- > 2.30.2 > -- Kees Cook