Received: by 2002:a05:6a10:5bc5:0:0:0:0 with SMTP id os5csp2848032pxb; Mon, 18 Oct 2021 03:15:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy8BqkvYdQrURuIvrOfyqm4k/5Ya01hGYXUdCpaK6jhecFKMb8SP2LqEAF0BGCufcmvbKA2 X-Received: by 2002:a63:7a4f:: with SMTP id j15mr21691971pgn.193.1634552104168; Mon, 18 Oct 2021 03:15:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634552104; cv=none; d=google.com; s=arc-20160816; b=aLZKkNPSgTzJePFrlVoohi/q/8E4l4VbYZp7mbXI+5BmKIqQRinvyhMqTUL/GYftkB GHA4FAMNxI8AXfdFTFxzJsA4QQWcG/JCvPBCvVJoRiM6nksPqSsYDST0LLm0TeuDCWq4 dQBBuMp3apN2GWstWxD+KxJL06sctJrsKYbt3h701PRITKetV5E8Jrz4eAKNH6FCxBcf +YrbtRxsD1jEnRiEB8Uo0lFMymCRViW08szuvD9ZHQpMkFVNQN/6j1ngN39O3B621jNo LhR6+4yi5KnGVzQyrX9uX2dJs/z7XgaPqI3vl23HSXNss6rwo8eof9crvA1hcI7t+yAZ 8LdA== 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=JRUJFkyjxq71rT2gSHQzVSwiRN9DYj/nxSJqzQ3gbXo=; b=z2N0M1bP2EHXwAFNzRH9T8G8u+afey/gN/j2VwZxOeXrjvVVIl12Cgx6931xIyQMFq HEmaJWPp25kQwpaT9csbRNoXgdNpUw8PKfcSAfpryKOJUwVgXDxVahZk4h5fBVtM8qWp 0IcPv4p3csQH+yABtOBSpsttRuP4+Zz2GeSnnbCip6ABI+BDX9O5qc6gon67ykuvhAMi QPXUEIW+St9PIL8nie2qH8ILVyVZLz7ZcOYdmeJt1JC8GzR4sE8cc/mxLM9UNrMRjz8i yVDkBwI0N6ftYJsVShfIEHXECH503fsevO/1QetOdl6BYWz7r5+r6bHcKGa4RlrSd/Gc DMbA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=2c9bfNEo; 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 b4si20623993pfm.276.2021.10.18.03.14.50; Mon, 18 Oct 2021 03:15:04 -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=2c9bfNEo; 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 S231719AbhJRKQj (ORCPT + 99 others); Mon, 18 Oct 2021 06:16:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44932 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231548AbhJRKPO (ORCPT ); Mon, 18 Oct 2021 06:15:14 -0400 Received: from bombadil.infradead.org (unknown [IPv6:2607:7c80:54:e::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6204EC061745; Mon, 18 Oct 2021 03:13:03 -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=JRUJFkyjxq71rT2gSHQzVSwiRN9DYj/nxSJqzQ3gbXo=; b=2c9bfNEown0FxgUx76waa6dAJ1 juGx4WEEb/2GYDwpo+2kWiNfb8mKj5wCudCfTMRRMuDONK4SdfxFXckn+v+TLDxVRWdfkaV9yQxBP CeiUc9hNu0ZQ0EcD3fU+rzmkOw2TuegmWB04g3cKaSlzQR4Yr8rX5tzt9jj1QRYpSMNPezpVp7vjh 2MK4teyEFHqjQbsCXAu8XrDi9HVCvmll2LLHLianu/zvRrFDKq8MFNKl0SvhAEu+WxcnXmkihzOze cT8rIbjlB19tAR3qaalJhymWcwHvZBpHkTkDqsd3vyjenWs4un+mcMVdEXfaGN6ckOHQjeipxzo7K TTShH9mQ==; 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 1mcPdS-00Ev2p-Si; Mon, 18 Oct 2021 10:12:51 +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, Jan Kara Subject: [PATCH 29/30] reiserfs: use sb_bdev_nr_blocks Date: Mon, 18 Oct 2021 12:11:29 +0200 Message-Id: <20211018101130.1838532-30-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 sb_bdev_nr_blocks helper instead of open coding it. Signed-off-by: Christoph Hellwig Reviewed-by: Kees Cook Reviewed-by: Jan Kara --- fs/reiserfs/super.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c index 8647a00434ea4..076f9ab943060 100644 --- a/fs/reiserfs/super.c +++ b/fs/reiserfs/super.c @@ -1199,9 +1199,7 @@ static int reiserfs_parse_options(struct super_block *s, if (!strcmp(arg, "auto")) { /* From JFS code, to auto-get the size. */ - *blocks = - i_size_read(s->s_bdev->bd_inode) >> s-> - s_blocksize_bits; + *blocks = sb_bdev_nr_blocks(s); } else { *blocks = simple_strtoul(arg, &p, 0); if (*p != '\0') { -- 2.30.2