Received: by 2002:a05:6a10:5bc5:0:0:0:0 with SMTP id os5csp2847129pxb; Mon, 18 Oct 2021 03:14:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzBJMrBdhHuy4s8bC89Qnto4Zg41EaS7Q+kG9Lh/6xwqKwffHJPPyt9T+/baTYGmLeUkuGR X-Received: by 2002:a17:90a:8a0a:: with SMTP id w10mr24334044pjn.60.1634552040973; Mon, 18 Oct 2021 03:14:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634552040; cv=none; d=google.com; s=arc-20160816; b=UMoQkZiQ4ZPhMiHEnmVTa1PS6+Ko07JUCEbOcKXIkuM9M7Wc8vOmqXJ+QH3ptsv7K2 qbemecl56FQpWHFRZXGPxQky8gnHTSw+pJxqEHXLWpsErO7mBQ1KR3I/nUuu14AA8TAa mR7uEmu3/dUFYsB1p/sxz45WZ8QWul+8N+hbgLT4fL4MDzmsm0+MwM0tPnXAAJz+UAtv yg0mVnNZUUR2GissYHBW+F/BBuLV9vUxo6xOu0EVh9+NBZxK1R6E/T+rnDaKqtaYE0tq 7046/srg3ePn1BEOqvap1mopTlltXF7RkcrPe96RZd4j0lrX93uqusKhmqaELHmFnf+x sSyQ== 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=c5d0QK+yd5Xo4ZZ7wO7eHh2GZgh8Yi/WWWEcEdNRvZM=; b=LxgedWcuQxHDRvtQZWLT1m9GiUPSvqTl4Vn2ZGOUErx8A9DNNj1aA5TyVAQ8ZdRNxW nFyCyslIrMcaB2Ge+rwCHEtggxMBaQodruv03nnAitQ+/+0SvnC50r+aEI02T9roFRCs fqGM/vxOJsjMrTTu68gSxMT7O76dZlZWn0sHidu4f/HI+UIBoLyDNfHeoj4aaSh5nAPv +QB22T6pjUu6/Im6LpbTcDTkkioOAT8aMzgAoU5vR7c61kmkZ8M2Jo5U2nEUa5SQITfq AM6Sup1q8xhQDBuWNVKua94uKEBC/hc6Xno1zqFifYJIQAsH1VFONMZXfFdr+NrApPHn 7w5g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=Q9jhLz2s; 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 o13si5136597pgu.156.2021.10.18.03.13.48; Mon, 18 Oct 2021 03:14:00 -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=Q9jhLz2s; 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 S232199AbhJRKPy (ORCPT + 99 others); Mon, 18 Oct 2021 06:15:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44874 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231899AbhJRKPA (ORCPT ); Mon, 18 Oct 2021 06:15:00 -0400 Received: from bombadil.infradead.org (unknown [IPv6:2607:7c80:54:e::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8BE96C06176E; Mon, 18 Oct 2021 03:12:49 -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=c5d0QK+yd5Xo4ZZ7wO7eHh2GZgh8Yi/WWWEcEdNRvZM=; b=Q9jhLz2siMwmvSLPOYWYIPiZGP y0U915DZ+evlzqHVz3DV1O/FavmbvZsw7RfdBAWNnvNJaj6+9Nq4DvZsR/YTJcgEYCGxXaqatGHKP yDvyRHFSy00UJZV752BkfjEH/fD2461Kd2Nh/ZIawUOt0iHor/iPgWmAxvmZxwX55Ed/7cx/j8rPV SNf6ZgiAQe3sIAPF11RZQEN1siUerZhJDcXbSSZfMbhVxXWTMClr0uAeQSWkuueQUtX0vO+lmSbYq UAh0GV1QcM2anbJwBeynrb7HmdJqrQveP82CI6hD1ieBX5VV3uAjGozfv3N2xisMO2f3bs4Pq82GI etwLfkEQ==; 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 1mcPdF-00EupS-H7; Mon, 18 Oct 2021 10:12:37 +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 , Chaitanya Kulkarni Subject: [PATCH 24/30] block: use bdev_nr_bytes instead of open coding it in blkdev_fallocate Date: Mon, 18 Oct 2021 12:11:24 +0200 Message-Id: <20211018101130.1838532-25-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: Jan Kara Reviewed-by: Chaitanya Kulkarni --- block/fops.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block/fops.c b/block/fops.c index 7bb9581a146cf..a6a4d412720cd 100644 --- a/block/fops.c +++ b/block/fops.c @@ -548,7 +548,7 @@ static long blkdev_fallocate(struct file *file, int mode, loff_t start, return -EOPNOTSUPP; /* Don't go off the end of the device. */ - isize = i_size_read(bdev->bd_inode); + isize = bdev_nr_bytes(bdev); if (start >= isize) return -EINVAL; if (end >= isize) { -- 2.30.2