Received: by 2002:a05:6a10:5bc5:0:0:0:0 with SMTP id os5csp2846392pxb; Mon, 18 Oct 2021 03:13:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwl9OZ7aDxMA8jTxQzAQ4rk7s26edEe32/ZkOJws/YwDliRmWlBazSuiotezQjYbyNzWlkM X-Received: by 2002:a05:6a00:1312:b0:44c:becf:b329 with SMTP id j18-20020a056a00131200b0044cbecfb329mr27698725pfu.5.1634551992938; Mon, 18 Oct 2021 03:13:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634551992; cv=none; d=google.com; s=arc-20160816; b=uFTYa0J9iN3TC5U+8WfjGZRT20T8aU1X+DoN/535iqiZ9rSaJ8l+F+nZhPhS9xi+wE K7ePvc5KbfczxCQvHnCOImNE0YWOSfGfOS+1Agt5XTPp30DknwUNE1HzxsdxucRRdpg0 st8sjbPWAyWaC5Mpbax4/hdrIBHr+5zerb70jDuG4xvJ2j9u8uTbzy/qcrCwkoZLEbod Rrow3+Cj4JtiQ9mpw/xf+9tlR365ZYGVfR+hmnt/H8u1pNJPTEHFF+qQ/QF2B3OXYNWy DqQrQjMiQBGNV4WNUcpNKZbwCf5WJjeU3MzitRxM//Gp1oAWFk3yShxsVF27AgH1TAAv sd1g== 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=mHbLY10hNejy/Eg6myZDAE3lqLMvy+937hMxKRWnYHI=; b=k0Eu2gpTzU0V/kilylLodc2qjbmQ0iMIbO3A6Fhei7WvFOX6N5kIFQp6L9CUe6BFFx pDpqhEOCxhD3vMn8HV/p7K8QGIVat/8Q7C8HUIA5IDgOmf0v2bKlqdVluJTzp/Z64L7q k/bcAH8tPvio01b/79Pv5axm3TlGF3VEpZQK1IJPq6VMKcsK55yLzDSM+q+CZt5EYiuJ w+eUmB5h01fM0V2rlubxP0g2S1Guj7X8ztkY08niRWcbNIhNfqHT7JGMDv7b2ck01hFo N1GcMd+ltUfyBGVKRrfRGGvl8dw61eHd001bG/1+JngzI7X81czfsTzke7z/jtvJbg9v BTRw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=lVSE9Qbk; 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 j4si10789594pgk.206.2021.10.18.03.13.00; Mon, 18 Oct 2021 03:13:12 -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=lVSE9Qbk; 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 S231877AbhJRKO6 (ORCPT + 99 others); Mon, 18 Oct 2021 06:14:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44738 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231690AbhJRKOd (ORCPT ); Mon, 18 Oct 2021 06:14:33 -0400 Received: from bombadil.infradead.org (unknown [IPv6:2607:7c80:54:e::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 87730C06161C; Mon, 18 Oct 2021 03:12:22 -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=mHbLY10hNejy/Eg6myZDAE3lqLMvy+937hMxKRWnYHI=; b=lVSE9QbkkoQXxeiFzmYuOXkVzc tp8w5cqd9YoUYaFy5SS//Pl+dSXRQ858H01p3jjW3ZspETzTE9+tAJqy+TqxTKpVvwZCPYHMgYmZ0 rLROFlKO3jLsHulgEWrW2lwwlerQZWnzw55Y5e0PNjG+msn7paVDEAzRRmQmdRlatzDlsISotUjAa FNG7mmz/tMs5EueSrUxn68Z6+4sN5Q3uHV3z/o99dybNhaOz+o/dXNMW7qATq2iZ0aSdjA4v3CvgV sVCXDnMBr3/xsUYOn5O01oB/n52uGNo+ikYPYJbXz1IJOc0rhnam7i9Hvi1kuJoq9MYrwXE6RWQyg rWKKUS8A==; 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 1mcPcm-00EuKW-66; Mon, 18 Oct 2021 10:12:08 +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 13/30] cramfs: use bdev_nr_bytes instead of open coding it Date: Mon, 18 Oct 2021 12:11:13 +0200 Message-Id: <20211018101130.1838532-14-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 --- fs/cramfs/inode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/cramfs/inode.c b/fs/cramfs/inode.c index 2be65269a987c..666aa380011e0 100644 --- a/fs/cramfs/inode.c +++ b/fs/cramfs/inode.c @@ -209,7 +209,7 @@ static void *cramfs_blkdev_read(struct super_block *sb, unsigned int offset, return read_buffers[i] + blk_offset; } - devsize = mapping->host->i_size >> PAGE_SHIFT; + devsize = bdev_nr_bytes(sb->s_bdev) >> PAGE_SHIFT; /* Ok, read in BLKS_PER_BUF pages completely first. */ for (i = 0; i < BLKS_PER_BUF; i++) { -- 2.30.2