Received: by 2002:a05:6a10:5bc5:0:0:0:0 with SMTP id os5csp825465pxb; Fri, 15 Oct 2021 17:24:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwnKeOSFIovtbFG6ZuoLiW0zcDIjWI+NaRmCB7Fw7cztMG7/Adzj0l5SrFb25alCVjjGLyh X-Received: by 2002:a62:17d3:0:b0:44c:6022:9428 with SMTP id 202-20020a6217d3000000b0044c60229428mr14675254pfx.65.1634343843837; Fri, 15 Oct 2021 17:24:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634343843; cv=none; d=google.com; s=arc-20160816; b=DeKVdRqWIcBU6yldCpRP+kdwYirIwp2/iL39bimm3RCRRxlSrXzK/vZgcWrPx114pp JuK92Xyb5bUeabZTrGe2vWgdIDJLSfE+oNQLJi6FMK9AKSBkx5EnCmrFZYvvIQe7BTgR K84pvMBQXasVVb2vCj23Avra7hfQEydaLCus63/MYOgJf8nYdEyqjzHGtvPJ+twbtCrK 7CEKzw4ItOuVvZdEqvmylKXikUFSFMUUjrwJ5hLm9X0rUf36AMTJ0aLnUdxgXDM8gvqO zalXmUiQs9wu0oHw/cyo6MPySTp5CmqL8EGi0NqFtQf+DzBjta7QStlbLJXUAqn8hC7D gmXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=JmkRxhA/wAtqRoJ695vCmDfNj7DKperG4SlvbF9/aQA=; b=MyMhUD39C90PIMLyEWSiWHup+ipTnFNYy9JN6LBz1P+XWlr0vvK2U+Sf6qv0WcVwNH OgbWDApVZ0mei96dbInnwhsGKmN91tkXJUAKBgV1sPLRHRJsfe1xaj1dXiTajk4HTbY3 5r/Qhf/omRXPOsKBSA+QSK7BzLH3h9UezyIb0i0J6wvQfytkdkocQyLnGPzwHrKpwhsF XTiP7eZui1wKAbQ6TuRL6cIUXcthbwzPmv4aSCt7vTyD3mxiIepCNTgbi2EbVnCpl+u0 fGP5hYWbS7BegarCm3C2FsRYRLKIqxWuPfQOpsQRnCPEG4bNrBy+0LuddKegnCQr+bKE Si5A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b="wypN/vpq"; spf=pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-ext4-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id r10si451510pfh.91.2021.10.15.17.23.50; Fri, 15 Oct 2021 17:24:03 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b="wypN/vpq"; spf=pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-ext4-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236866AbhJONb4 (ORCPT + 99 others); Fri, 15 Oct 2021 09:31:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40976 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235544AbhJONar (ORCPT ); Fri, 15 Oct 2021 09:30:47 -0400 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 92BEFC06177C; Fri, 15 Oct 2021 06:27:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=JmkRxhA/wAtqRoJ695vCmDfNj7DKperG4SlvbF9/aQA=; b=wypN/vpqWEe4eyY+lcYsyi5G6t EFTB+DPye+4Z7VDnOsbbi0apS4pmn4a8XxC5sILqUOkVjxDUyZbey+j8viuPAFaeNg6eHIxX2VwyH dE/3xSe95iP8DD8qyy7yBOv/QKz87kRU91gb9BXox+1MmhQm/A5MxyoT5+9Q63gq3Vcc2oAgiEEfL kF1kTAME2ZwoHx+3XkjZLoLBQmilkUIaUlehPGJBweUx90h95wU/dJvXLXVXkOqCmPO1FuLazcWgV UwppXlrZt0dWbGCeEi7568como3wDgowb8e8sg+tZTtMGL9fj/WILYzldlzkIuUQuExrm7LI6/3Tk 89SyaEnQ==; Received: from [2001:4bb8:199:73c5:ddfe:9587:819b:83b0] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1mbNFE-007DLy-QR; Fri, 15 Oct 2021 13:27:33 +0000 From: Christoph Hellwig To: Jens Axboe Cc: Coly Li , Mike Snitzer , Song Liu , David Sterba , Josef Bacik , "Theodore Ts'o" , OGAWA Hirofumi , Dave Kleikamp , Ryusuke Konishi , Anton Altaparmakov , Konstantin Komarov , Kees Cook , 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 Subject: [PATCH 18/30] nfs/blocklayout: use bdev_nr_bytes instead of open coding it Date: Fri, 15 Oct 2021 15:26:31 +0200 Message-Id: <20211015132643.1621913-19-hch@lst.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211015132643.1621913-1-hch@lst.de> References: <20211015132643.1621913-1-hch@lst.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org Use the proper helper to read the block device size. Signed-off-by: Christoph Hellwig --- fs/nfs/blocklayout/dev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/nfs/blocklayout/dev.c b/fs/nfs/blocklayout/dev.c index acb1d22907daf..5e56da748b2ab 100644 --- a/fs/nfs/blocklayout/dev.c +++ b/fs/nfs/blocklayout/dev.c @@ -252,7 +252,7 @@ bl_parse_simple(struct nfs_server *server, struct pnfs_block_dev *d, d->bdev = bdev; - d->len = i_size_read(d->bdev->bd_inode); + d->len = bdev_nr_bytes(d->bdev); d->map = bl_map_simple; printk(KERN_INFO "pNFS: using block device %s\n", @@ -367,7 +367,7 @@ bl_parse_scsi(struct nfs_server *server, struct pnfs_block_dev *d, return PTR_ERR(bdev); d->bdev = bdev; - d->len = i_size_read(d->bdev->bd_inode); + d->len = bdev_nr_bytes(d->bdev); d->map = bl_map_simple; d->pr_key = v->scsi.pr_key; -- 2.30.2