From patchwork Tue Apr 23 22:55:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 13640866 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id D907AC4345F for ; Tue, 23 Apr 2024 22:56:05 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5FC106B018D; Tue, 23 Apr 2024 18:56:05 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 537376B018F; Tue, 23 Apr 2024 18:56:05 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 44CF16B0190; Tue, 23 Apr 2024 18:56:05 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 1ABDE6B018D for ; Tue, 23 Apr 2024 18:56:05 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 8D762120F96 for ; Tue, 23 Apr 2024 22:56:04 +0000 (UTC) X-FDA: 82042306248.03.230AFE7 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf24.hostedemail.com (Postfix) with ESMTP id B4A8418001D for ; Tue, 23 Apr 2024 22:56:02 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=NT2phuhB; spf=none (imf24.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1713912962; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=INusEyB6dR3vgU5usJpWnfIw4VplmU4zwONWpNN/d/w=; b=DVCR174tbAWgAc//mIUHPelxnDZ64y9RQ8zkEAMse1JVGgEoYua+e8y1HL42qiWO7UlhE3 RhGBi+bxjQQIwerr7bAdB59tUEcgsLq349HUm2umulIKSF3Q8VUiiF5ZspLhA08MhIO7bd y6qBofoiAZNYczbXLXNXmJnWabRlldA= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1713912962; a=rsa-sha256; cv=none; b=KZ4rxJ3cFQZac7TZmi0ihj8sl8QyyysasWcDWOe70TyD7zxvS5fksOrThEBfRO2zwwmWOa pNfkS5kwnkhTIxe8GuJT9HFde61/lzMxKog0loRnk7zYBcOrSwu9w0Say2hn16tPsCy7Bg 8/llCTrcCAbQmkp4aO7rdMtmzbrDQ9M= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=NT2phuhB; spf=none (imf24.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; 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=INusEyB6dR3vgU5usJpWnfIw4VplmU4zwONWpNN/d/w=; b=NT2phuhB9ilem0ZbyyRx5jBEPe JMbXTjlRG5reeWvDli1o699wO7DV0K1j8OXZXC8c8ksIm2T9sSZfzRhbwbbmtDaYai/OMJX/h/1JI 2Hn/U3vhEWzalCdjm77c4mqnQ+rH/OsTFTV8JaPtAvfgZwPAvz5UHlCvTC8+vsBdFMTjE3HcZXKYo DpCBiYu1SklMcCKYgHCwhIswIDNhKdBrOEFI9xxAiMPxg3s4gsElsBR9yY7M+djUeP8uizrw/2tDR YHfKURym5m/8DjC3/f6CiRiSoFIkd0ryFFDjaIS3EB+O0v+cFV4uZQo6kEfFJbQf6gmj6pJeYFn6Y S3L4opow==; Received: from willy by casper.infradead.org with local (Exim 4.97.1 #2 (Red Hat Linux)) id 1rzP3K-0000000HG6E-1Erv; Tue, 23 Apr 2024 22:55:54 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton , linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" , linux-fsdevel@vger.kernel.org, linux-fscrypt@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net Subject: [PATCH 1/6] fscrypt: Convert bh_get_inode_and_lblk_num to use a folio Date: Tue, 23 Apr 2024 23:55:32 +0100 Message-ID: <20240423225552.4113447-2-willy@infradead.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240423225552.4113447-1-willy@infradead.org> References: <20240423225552.4113447-1-willy@infradead.org> MIME-Version: 1.0 X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: B4A8418001D X-Rspam-User: X-Stat-Signature: i787hbothtxyuz1miezcfufxgpkf7c54 X-HE-Tag: 1713912962-145795 X-HE-Meta: U2FsdGVkX19DB2DxW1+OxAT1pz1VMOt/S78I05Fk6Nf5c0shYl7NPwc8WOTe+De+qhjuyzv62IWSDXg5Xwt+/4r38gMTFJBi7bBQuEShpWKm0Q8ChcqDAEcgolOBKs2GuuvuzAqPYfaUt34jU7G5icgsnH0oyQLpky5IiNt74XZKLSd3zYKOYOSGzBf0EJIaITdTMyGP+r5BYARpFt/EM8HSl8iZfbFEqxsjdcz6PiHk1JGFP/5AcfAz20SWdoh3IQqQv+mQzNT1D0/dagcdWvAelentQA2Ssc3W6iAZd89JrOkEJ2T6VWHfl5OPvxkWEa/PxML5m2qPjSpHWTUeq5Ehf1anmbGJyuPlO2xz8V138j8y7/apUS/jqsvTCfsqjSzrzYorSRap7zwaMzjp6Q7JOMkqzEJj+gFjWVUvS8XyShP4Kx1NrIOp1DWwmLyh332qZZmwo87F8xWr6Tkps6U1hfLnP3cOgSYQrK3sxoUtFf3at8gzkzszgk6+4vIFExbNLv5RFgyDFpIu9hmy0CoYrESX5yyv2kRZvMmNYAxWUMxoRFrwU0gr2qRM5ariizGqB222EP3dN7SBD7eQTfsmoefuf/xsDXYeFPSETLTSfvsk8Um/Bz4tVZucO7gV3syvqR3UNI2eKfMsuQLuMKVqwpnSi0pnXIbsVXyqTtJCboaiczOLUrT3yCZ0/uWcH0Zr0jaSKtqanKu60qxh+cKl9hsuX+aihMl/SuPOj6TOStkX5jUc83FZNYB2Y+R3bBhEu94a9JMpYBI89HEi6MrZhs9aON1bWktQqYZnqel6MZQ/RM8usSzMbneLe4VanN4UPRRAkIlEMGG0RWDlgrKdVo5dRbqOmXQf0u56cMNq4AeZTD6D2YOl7jtb+LazYfJTx+4NlQmHFneSLqk7J9+O2NmjEJTKd2wSt8/Ehp87zCVDfpm/RA2yF1k042ji0H/ZC8vBUN6VXggJ9a5 LRLrYWBD czHJTHAiiEvx1gYrsJuKsLm8snNf3n6syjD5QY/Cm5+oBtAPqSnOOkT4yIN/A05xmhPgTRTOKO6mdkKWnVt/+eeZ8SLEv2LtWXibXt6CooYQwSU0nBP5vwJ/pHnhyNDq/rkTMohD0ib5x0h10h4Nq7KS6Axeo+cVICRLI8q/KLH3wC0kM9YlOLEqo0pCsMILFBkwa8i02rBR3x/3GNA2WA6JQ+jSIAlys0Iga X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Remove uses of page->index, page_mapping() and b_page. Saves a call to compound_head(). Signed-off-by: Matthew Wilcox (Oracle) Reviewed-by: Eric Biggers --- fs/crypto/inline_crypt.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/crypto/inline_crypt.c b/fs/crypto/inline_crypt.c index b4002aea7cdb..40de69860dcf 100644 --- a/fs/crypto/inline_crypt.c +++ b/fs/crypto/inline_crypt.c @@ -284,7 +284,7 @@ static bool bh_get_inode_and_lblk_num(const struct buffer_head *bh, const struct inode **inode_ret, u64 *lblk_num_ret) { - struct page *page = bh->b_page; + struct folio *folio = bh->b_folio; const struct address_space *mapping; const struct inode *inode; @@ -292,13 +292,13 @@ static bool bh_get_inode_and_lblk_num(const struct buffer_head *bh, * The ext4 journal (jbd2) can submit a buffer_head it directly created * for a non-pagecache page. fscrypt doesn't care about these. */ - mapping = page_mapping(page); + mapping = folio_mapping(folio); if (!mapping) return false; inode = mapping->host; *inode_ret = inode; - *lblk_num_ret = ((u64)page->index << (PAGE_SHIFT - inode->i_blkbits)) + + *lblk_num_ret = ((u64)folio->index << (PAGE_SHIFT - inode->i_blkbits)) + (bh_offset(bh) >> inode->i_blkbits); return true; }