Received: by 2002:a05:6a10:5bc5:0:0:0:0 with SMTP id os5csp2846034pxb; Mon, 18 Oct 2021 03:12:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzYYQV9d22s2BNlODfrj5Exdw7bMgmLyad8Ws9ex6jnKIXqgC6/jZZ7uxgHe146RPmgrV6P X-Received: by 2002:a65:45cd:: with SMTP id m13mr23172896pgr.26.1634551966244; Mon, 18 Oct 2021 03:12:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634551966; cv=none; d=google.com; s=arc-20160816; b=OFmBsUOyL2wuoQVwN821e+/hjWrT3LSNkS/Qc16HwhV45AUoDstifyihht4T9Uar7z 71u9G0FA2uzEvG6wFblHaXI6Qr9eQ7vdh2a8Pf6nFCbJTTZ4wnKtoHY7p4gwGyvD3Zy0 9UFn+OEQhthGYTviInpl4gJ0DjqhzGIz8iTstFsuCdQVQT2cQMEdYv/qy0SIC7h0AYtq e2gPSJoQMfyhuI3jd8spsyQ464QqQR2b8sFZaT6EFbko6U3lb5vtfJIgBstxqDT58FM8 eUjuWBe5WWFI8Bn4X4zbFsj0HyLJKfNE4tQr5gakbG0BQv5PzkQ9ViP91NbQ6Pa7Zsmb 2d/w== 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=6+r/5plvJ8OP57S4LNsM02c/IkmCxsa75L+hdJWrUDU=; b=DzFbCN8FE5ehAtBkF+z/S9sQGrmzlnAcyUBqz7qInoIdlt5KETBimlX16OHvLSAqPx i/81gsRpwwqQbmwW/YH39/e4W/zcYN5OqEz+1k9h0Sb8GQzgWGRqUZhaasgYLihvlv/W vqqKJhUAyuBuanJL5UYadVcaZHvnA1FW1yw+tAIJyYu1OEVC+Vl5urFjLzGKZyqQDT83 kateZGJzSWOfWIwdrI4MkcgM5ER6kU1SAlJCPNzL+QbEAKQw5In1/2g2rRsqfRVIopSw oa9kxZ2cTc1hAdZpwB/aTkQ8BlG1fC/oEY2Sj/QeCYuWiwqSGSE4alDaITkOnxrY0Kfr 6FAA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=CDejVvRD; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-nfs-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 h187si20850862pgc.377.2021.10.18.03.12.33; Mon, 18 Oct 2021 03:12:46 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-nfs-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=CDejVvRD; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231628AbhJRKO2 (ORCPT + 99 others); Mon, 18 Oct 2021 06:14:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44642 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231459AbhJRKON (ORCPT ); Mon, 18 Oct 2021 06:14:13 -0400 Received: from bombadil.infradead.org (unknown [IPv6:2607:7c80:54:e::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AF574C061768; Mon, 18 Oct 2021 03:12:02 -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=6+r/5plvJ8OP57S4LNsM02c/IkmCxsa75L+hdJWrUDU=; b=CDejVvRDk7Qb9gEhmgVjzqQBVb hvfANwFgD7mOJI0RdAxab+2iVmaL0EuslPUiSh8SHK8RScRHDdkm+lx4pF6Ai1uKLbtJJIbF7vWFx X5xYRd2RUCJuROiA0FbpJdYGvAApQ7ITvpqhJkJ6O5MDI0+PBQADpk12TdZMvXI/cKUgdVyS4Tace LoxsNvO3Dw9y1fZLvdmOdSwrPtf8ErzRdno4kZO0tgeZ4ODs+8bVCKv0QR2EgOvzhnPnPmFFuJ2R7 CihJa9cH9kwa15XDTY3ZZMl8Xagl5mAfuWw8Ry/2YwSJlxXugjUSblFi9tIr/9Ewm9gOhaodLSiJd vFU/zxiw==; Received: from [2001:4bb8:199:73c5:c70:4a89:bc61:2] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1mcPcN-00Eu1r-TL; Mon, 18 Oct 2021 10:11:44 +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, Lee Duncan , Chaitanya Kulkarni Subject: [PATCH 04/30] drbd: use bdev_nr_sectors instead of open coding it Date: Mon, 18 Oct 2021 12:11:04 +0200 Message-Id: <20211018101130.1838532-5-hch@lst.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211018101130.1838532-1-hch@lst.de> References: <20211018101130.1838532-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-nfs@vger.kernel.org Use the proper helper to read the block device size. Signed-off-by: Christoph Hellwig Reviewed-by: Kees Cook Reviewed-by: Lee Duncan Reviewed-by: Chaitanya Kulkarni --- drivers/block/drbd/drbd_int.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h index 5d9181382ce19..75fda53eed8cf 100644 --- a/drivers/block/drbd/drbd_int.h +++ b/drivers/block/drbd/drbd_int.h @@ -1826,8 +1826,7 @@ static inline sector_t drbd_md_last_sector(struct drbd_backing_dev *bdev) /* Returns the number of 512 byte sectors of the device */ static inline sector_t drbd_get_capacity(struct block_device *bdev) { - /* return bdev ? get_capacity(bdev->bd_disk) : 0; */ - return bdev ? i_size_read(bdev->bd_inode) >> 9 : 0; + return bdev ? bdev_nr_sectors(bdev) : 0; } /** -- 2.30.2