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 2673DC6FA83 for ; Fri, 2 Sep 2022 19:47:29 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3FCFC8010C; Fri, 2 Sep 2022 15:47:04 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 912E880104; Fri, 2 Sep 2022 15:47:03 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 56BE280100; Fri, 2 Sep 2022 15:47:03 -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 D0D65800FA for ; Fri, 2 Sep 2022 15:47:02 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id B2AB5801EA for ; Fri, 2 Sep 2022 19:47:02 +0000 (UTC) X-FDA: 79868178684.30.A61AA14 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf16.hostedemail.com (Postfix) with ESMTP id 4A188180053 for ; Fri, 2 Sep 2022 19:47:02 +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=vz0t8JH6vL8+F/QHJWuBLbUJiPp5/CD23wS+rUMcnKA=; b=aRt19jJgIa8RgtL88FscQgLE9W P0KQDIjFKBAlX51t+CXueIpmtRBK/HLGGVIRBQ3UnX6Gulga4q6yt+L5uErQF3/ikcelk/M55d667 87cCGOfGDYqh9IJ0OzITHRjC+QZ+OCD4fqSUhI3V/yF/Popd5Si+nLlJZh3ZW2nAq62UjpRmN0Dfi 2EFLg/uuuP9HnTVG5H1ecqiHY7fGHDXXDt8Aj8ZJ6VDPl/f7d2J1TC3wJ66tkWePyg2YmqbYMh9Z8 yuFbMeJGdnWJB82krXWmsHIYWiIAHpgBKbJFk9piwskC3+70veHKtxfVcdHwbvYpjMV860PLJSge3 NkHWDSBw==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1oUCd2-007Ie5-WD; Fri, 02 Sep 2022 19:47:01 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org Subject: [PATCH v2 30/57] shmem: Convert shmem_get_link() to use a folio Date: Fri, 2 Sep 2022 20:46:26 +0100 Message-Id: <20220902194653.1739778-31-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=1662148022; 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=vz0t8JH6vL8+F/QHJWuBLbUJiPp5/CD23wS+rUMcnKA=; b=iMb5W1c+RPzV41jdiKY+1fSTI2p+Sw31zckSo5g/TL3NGoo2w9ulD3ha7R+mIYk5rTUmwA JhZQjsNHEFB18B/RdnhV+sGCUU61KbEkvmHrAvJ4rpQC7F14l1LAYQ1r6dQvmPVqdlcTJA hARe+fVRRwnbpCvFpAcWIzmHfYlBY+E= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=aRt19jJg; 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=1662148022; a=rsa-sha256; cv=none; b=KJD3BCi7d/RD9+ieKQ1MUuHmb7jRzuyt1qsl6LUvYSzoXL2o5wp38YA0+HW/s7d3nFLSxc UJqs+SdbwkNhQJ1zlT67XcyxlqtWx/joOe39aiR0N/Ap6fs2sqOj1Cq6GbV2myfM80RbJC QUKpvweIbl5ZLFNM3gP17mgDgo4bAPo= X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 4A188180053 Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=aRt19jJg; 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: idumfmpxunoreifmi3ww59usi3ijuykf X-HE-Tag: 1662148022-24101 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: Symlinks will never use a large folio, but using the folio API removes a lot of unnecessary folio->page->folio conversions. Signed-off-by: Matthew Wilcox (Oracle) --- mm/shmem.c | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index a4251c66f317..ab39753064f1 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -3142,40 +3142,41 @@ static int shmem_symlink(struct user_namespace *mnt_userns, struct inode *dir, static void shmem_put_link(void *arg) { - mark_page_accessed(arg); - put_page(arg); + folio_mark_accessed(arg); + folio_put(arg); } static const char *shmem_get_link(struct dentry *dentry, struct inode *inode, struct delayed_call *done) { - struct page *page = NULL; + struct folio *folio = NULL; int error; + if (!dentry) { - page = find_get_page(inode->i_mapping, 0); - if (!page) + folio = filemap_get_folio(inode->i_mapping, 0); + if (!folio) return ERR_PTR(-ECHILD); - if (PageHWPoison(page) || - !PageUptodate(page)) { - put_page(page); + if (PageHWPoison(&folio->page) || + !folio_test_uptodate(folio)) { + folio_put(folio); return ERR_PTR(-ECHILD); } } else { - error = shmem_getpage(inode, 0, &page, SGP_READ); + error = shmem_get_folio(inode, 0, &folio, SGP_READ); if (error) return ERR_PTR(error); - if (!page) + if (!folio) return ERR_PTR(-ECHILD); - if (PageHWPoison(page)) { - unlock_page(page); - put_page(page); + if (PageHWPoison(&folio->page)) { + folio_unlock(folio); + folio_put(folio); return ERR_PTR(-ECHILD); } - unlock_page(page); + folio_unlock(folio); } - set_delayed_call(done, shmem_put_link, page); - return page_address(page); + set_delayed_call(done, shmem_put_link, folio); + return folio_address(folio); } #ifdef CONFIG_TMPFS_XATTR -- 2.35.1