From mboxrd@z Thu Jan 1 00:00:00 1970 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 4BB50C6FA82 for ; Fri, 2 Sep 2022 19:47:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6759F800F1; Fri, 2 Sep 2022 15:47:02 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 600D5800F8; Fri, 2 Sep 2022 15:47:02 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 42891800F5; Fri, 2 Sep 2022 15:47:02 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 30CF6800F1 for ; Fri, 2 Sep 2022 15:47:02 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 192851A0A06 for ; Fri, 2 Sep 2022 19:47:02 +0000 (UTC) X-FDA: 79868178684.14.FA52526 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf16.hostedemail.com (Postfix) with ESMTP id A9B7818004E for ; Fri, 2 Sep 2022 19:47:01 +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=ezUYIihnvv+vElD4XkRV6U4Svwf+ms2+pO0xLEEtH10=; b=i0JP9pKetNzcKZrAiI+YZ0Y29G Mhz1SmjXX3jBwmKDRsIlZ4JsQqhU1rRfckEKaf2e8ueDE/RzXqYthnA5r+4v/c0Iu8+jBJCxF3adB /myM0wPF4vP4yfVxSesxXcgMJEQ3Jr6kXn+Q9JK9ptqDVOyAkfd2R0qq12sYkSdFpjKiw1CkJYBrY O6rJv19L2mRgbDXY7I+sTB+ch+r/21xgptmnvwS4FjpeK2RLeIV5ZilEjAvBFVWzWp7QYK4s727IE qzzYlasJIx7jZsBX9FoqXJpnBrxNmG2BuvvBeY0wE/1iEEA72QBWiEPYOfBh80TJUZqs7Lp7V4Y2/ bMZU6a4A==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1oUCd2-007Ids-RP; Fri, 02 Sep 2022 19:47:00 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org Subject: [PATCH v2 29/57] shmem: Convert shmem_symlink() to use a folio Date: Fri, 2 Sep 2022 20:46:25 +0100 Message-Id: <20220902194653.1739778-30-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220902194653.1739778-1-willy@infradead.org> References: <20220902194653.1739778-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1662148021; 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=ezUYIihnvv+vElD4XkRV6U4Svwf+ms2+pO0xLEEtH10=; b=CfNf8/mx4M9KWUcWAT/YdJ0VEekL1dJROrlx5b1BmIkxMFj7QTB0lWK/JH9kG0+kGU4lFc 9fcLfanprtGkzmOc32RWEcnjHR3qRqaSrNUwh74xT15SpBvuTbc3heW/fWKFK8wsSiX7om +zVBp4S08DegHA4HCJjiRU9MCtAmOmQ= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=i0JP9pKe; dmarc=none; spf=none (imf16.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1662148021; a=rsa-sha256; cv=none; b=NFqoEsb/dMEHU04heD/+N0o2ndAXT8YsGyvLbq0zQuc+/A+G11H2OqYxKwlpnkFfth6eXP AZVACnbkFAOfHALo3FjsG4pdkMspxTnlUphwPdDATsg/KKdY43MMpPfP1iubgteyI60lKQ DbExLqhZQp63k403wvWYUtH7N2OTlGM= X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: A9B7818004E Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=i0JP9pKe; dmarc=none; spf=none (imf16.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org X-Rspam-User: X-Stat-Signature: 89j7byouoq87tszjpsyzi9g7f7nkjyb6 X-HE-Tag: 1662148021-153310 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: 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) --- mm/shmem.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index f251b026e83f..a4251c66f317 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -3092,7 +3092,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) @@ -3120,18 +3120,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); -- 2.35.1