From: Kent Overstreet <kent.overstreet@gmail.com>
To: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org,
akpm@linux-foundation.org, sfrench@samba.org,
linux-cifs@vger.kernel.org
Cc: Kent Overstreet <kent.overstreet@gmail.com>
Subject: [PATCH 1/2] cifs: convert to add_to_page_cache()
Date: Mon, 19 Oct 2020 14:59:10 -0400 [thread overview]
Message-ID: <20201019185911.2909471-1-kent.overstreet@gmail.com> (raw)
This is just open coding add_to_page_cache(), and the next patch will
delete add_to_page_cache_locked().
Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
---
fs/cifs/file.c | 21 +++++----------------
1 file changed, 5 insertions(+), 16 deletions(-)
diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index be46fab4c9..a17a21181e 100644
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -4296,20 +4296,12 @@ readpages_get_pages(struct address_space *mapping, struct list_head *page_list,
page = lru_to_page(page_list);
- /*
- * Lock the page and put it in the cache. Since no one else
- * should have access to this page, we're safe to simply set
- * PG_locked without checking it first.
- */
- __SetPageLocked(page);
- rc = add_to_page_cache_locked(page, mapping,
- page->index, gfp);
+ rc = add_to_page_cache(page, mapping,
+ page->index, gfp);
/* give up if we can't stick it in the cache */
- if (rc) {
- __ClearPageLocked(page);
+ if (rc)
return rc;
- }
/* move first page to the tmplist */
*offset = (loff_t)page->index << PAGE_SHIFT;
@@ -4328,12 +4320,9 @@ readpages_get_pages(struct address_space *mapping, struct list_head *page_list,
if (*bytes + PAGE_SIZE > rsize)
break;
- __SetPageLocked(page);
- rc = add_to_page_cache_locked(page, mapping, page->index, gfp);
- if (rc) {
- __ClearPageLocked(page);
+ rc = add_to_page_cache(page, mapping, page->index, gfp);
+ if (rc)
break;
- }
list_move_tail(&page->lru, tmplist);
(*bytes) += PAGE_SIZE;
expected_index++;
--
2.28.0
next reply other threads:[~2020-10-19 18:59 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-19 18:59 Kent Overstreet [this message]
2020-10-19 18:59 ` [PATCH 2/2] fs: kill add_to_page_cache_locked() Kent Overstreet
2020-10-19 19:12 ` Matthew Wilcox
2020-10-21 9:24 ` [fs] 8e602a0a70: kernel_BUG_at_mm/filemap.c kernel test robot
2020-10-20 7:58 ` [PATCH 1/2] cifs: convert to add_to_page_cache() Christoph Hellwig
2020-10-20 17:08 ` Steve French
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=20201019185911.2909471-1-kent.overstreet@gmail.com \
--to=kent.overstreet@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=linux-cifs@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sfrench@samba.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).