From: "Matthew Wilcox (Oracle)" <willy@infradead.org>
To: Naoya Horiguchi <naoya.horiguchi@nec.com>,
Andrew Morton <akpm@linux-foundation.org>
Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>,
linux-fsdevel@vger.kernel.org, linux-mm@kvack.org
Subject: [PATCH 2/6] memory-failure: Use a folio in me_pagecache_dirty()
Date: Fri, 17 Nov 2023 16:14:43 +0000 [thread overview]
Message-ID: <20231117161447.2461643-3-willy@infradead.org> (raw)
In-Reply-To: <20231117161447.2461643-1-willy@infradead.org>
Replaces three hidden calls to compound_head() with one visible one.
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
---
mm/memory-failure.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/mm/memory-failure.c b/mm/memory-failure.c
index 496e8ecd8496..d2764fd3e448 100644
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
@@ -1138,15 +1138,16 @@ static int me_pagecache_dirty(struct page_state *ps, struct page *p)
*/
static int me_swapcache_dirty(struct page_state *ps, struct page *p)
{
+ struct folio *folio = page_folio(p);
int ret;
bool extra_pins = false;
- ClearPageDirty(p);
+ folio_clear_dirty(folio);
/* Trigger EIO in shmem: */
- ClearPageUptodate(p);
+ folio_clear_uptodate(folio);
ret = delete_from_lru_cache(p) ? MF_FAILED : MF_DELAYED;
- unlock_page(p);
+ folio_unlock(folio);
if (ret == MF_DELAYED)
extra_pins = true;
--
2.42.0
next prev parent reply other threads:[~2023-11-17 16:15 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-17 16:14 [PATCH 0/6] Convert aops->error_remove_page to ->error_remove_folio Matthew Wilcox (Oracle)
2023-11-17 16:14 ` [PATCH 1/6] memory-failure: Use a folio in me_pagecache_clean() Matthew Wilcox (Oracle)
2023-11-17 16:14 ` Matthew Wilcox (Oracle) [this message]
2023-11-17 16:14 ` [PATCH 3/6] memory-failure: Convert delete_from_lru_cache() to take a folio Matthew Wilcox (Oracle)
2023-11-17 16:14 ` [PATCH 4/6] memory-failure: Use a folio in me_huge_page() Matthew Wilcox (Oracle)
2023-11-17 16:14 ` [PATCH 5/6] memory-failure: Convert truncate_error_page to truncate_error_folio Matthew Wilcox (Oracle)
2023-11-17 16:14 ` [PATCH 6/6] fs: Convert error_remove_page to error_remove_folio Matthew Wilcox (Oracle)
2023-11-17 17:28 ` Andrew Morton
2023-11-17 18:14 ` Matthew Wilcox
2023-11-20 0:33 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231117161447.2461643-3-willy@infradead.org \
--to=willy@infradead.org \
--cc=akpm@linux-foundation.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=naoya.horiguchi@nec.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.