Message ID | 20220808193430.3378317-33-willy@infradead.org (mailing list archive) |
---|---|
State | New |
Headers | show
Return-Path: <owner-linux-mm@kvack.org> 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 158AAC00140 for <linux-mm@archiver.kernel.org>; Mon, 8 Aug 2022 19:35:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BCA018E0009; Mon, 8 Aug 2022 15:35:30 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8F5CB8E000B; Mon, 8 Aug 2022 15:35:30 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5E0518E0001; Mon, 8 Aug 2022 15:35:30 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 2715A8E0009 for <linux-mm@kvack.org>; Mon, 8 Aug 2022 15:35:30 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 0BDD01A0AB5 for <linux-mm@kvack.org>; Mon, 8 Aug 2022 19:35:30 +0000 (UTC) X-FDA: 79777429620.11.67292AA Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf14.hostedemail.com (Postfix) with ESMTP id 76489100165 for <linux-mm@kvack.org>; Mon, 8 Aug 2022 19:35:29 +0000 (UTC) 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=oKWgL+GAkV2UorbTCCg0q6V99pHLaC7KYMyhuwUPzbw=; b=coB/DCXR1XSOKI087AYObYsUEn hOhujcbfUV+G8xGpbBWMP4YXPsIEuCGJXayYLUAInoVvIwxh6Ulf/wfGZTZ5Jpzj6lbzqrN+89qz5 IIVm13B2bmVqLedYANLO4OfihvSukVtFOgwdcUTBkQQVOeNIQX6kbIM52pp2S35P+HfHSZ85hUNCx tPG33uJZpokZ+2abY7NdGbqgwLApskKABEbxPLs387gP69zoJpCAUY34AtXkO1f0+IDbWgDBgn7vK yD0L1tRVmxRmKMRwPJFca1fFRkf7lpBy5taihFVP0mxSWjcE94egKwRaL/fuwp2eSqzholmk+h1qc 5obMnTOQ==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1oL8X9-00EAyB-Ly; Mon, 08 Aug 2022 19:35:27 +0000 From: "Matthew Wilcox (Oracle)" <willy@infradead.org> To: linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>, hughd@google.com Subject: [PATCH 32/59] shmem: Convert shmem_symlink() to use a folio Date: Mon, 8 Aug 2022 20:34:00 +0100 Message-Id: <20220808193430.3378317-33-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220808193430.3378317-1-willy@infradead.org> References: <20220808193430.3378317-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b="coB/DCXR"; spf=none (imf14.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-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1659987329; a=rsa-sha256; cv=none; b=v2+e8FI7m2Fruonj4TZ+rSuDXnMQXhSV92EC/cIzoDVgAo700w1arBhCHxe+idKFTUAyK1 I3J3sxpdxpKoxKv/oTzKsHj0XVs++m4BbROwWhz3KUQ5GfbzHLPDmH13/iIPf11xCT1OtO HoHSkczCF3+/IrIrqny7pPIuiaz9/mU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1659987329; 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=oKWgL+GAkV2UorbTCCg0q6V99pHLaC7KYMyhuwUPzbw=; b=UBFMUMPpT15x5sMGqqVMEH1GU0IulaO/Q6AnNszvzhm2sfmFm/Z+PgYlG+yZsmZyM5o88m bXQ8L2BPeNWGVA+Gv8knzvWpwYTuGUg0O72WXVQ2saNzgfhojVVo0luUGhp2oBzaulOaEN LRsTrK/bXL6xJR6KxLQ3BibEn6ouNfg= X-Stat-Signature: 1tc1dt6gokx6ugufia3fwpizde9h1tcq X-Rspam-User: X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 76489100165 Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b="coB/DCXR"; spf=none (imf14.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none X-HE-Tag: 1659987329-343873 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: <linux-mm.kvack.org> |
Series |
MM folio changes for 6.1
|
expand
|
diff --git a/mm/shmem.c b/mm/shmem.c index fda56776b510..9af2292e257b 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -3076,7 +3076,7 @@ static int shmem_symlink(struct user_namespace *mnt_userns, struct inode *dir, int error; int len; struct inode *inode; - struct page *page; + struct folio *folio; len = strlen(symname) + 1; if (len > PAGE_SIZE) @@ -3104,18 +3104,18 @@ static int shmem_symlink(struct user_namespace *mnt_userns, struct inode *dir, inode->i_op = &shmem_short_symlink_operations; } else { inode_nohighmem(inode); - error = shmem_getpage(inode, 0, &page, SGP_WRITE); + error = shmem_get_folio(inode, 0, &folio, SGP_WRITE); if (error) { iput(inode); return error; } inode->i_mapping->a_ops = &shmem_aops; inode->i_op = &shmem_symlink_inode_operations; - memcpy(page_address(page), symname, len); - SetPageUptodate(page); - set_page_dirty(page); - unlock_page(page); - put_page(page); + memcpy(folio_address(folio), symname, len); + folio_mark_uptodate(folio); + folio_mark_dirty(folio); + folio_unlock(folio); + folio_put(folio); } dir->i_size += BOGO_DIRENT_SIZE; dir->i_ctime = dir->i_mtime = current_time(dir);
While symlinks will always be < PAGE_SIZE, using the folio APIs gets rid of unnecessary calls to compound_head(). Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org> --- mm/shmem.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)