From: Steve French <smfrench@gmail.com>
To: Kent Overstreet <kent.overstreet@gmail.com>
Cc: LKML <linux-kernel@vger.kernel.org>,
linux-fsdevel <linux-fsdevel@vger.kernel.org>,
Andrew Morton <akpm@linux-foundation.org>,
Steve French <sfrench@samba.org>,
CIFS <linux-cifs@vger.kernel.org>
Subject: Re: [PATCH v2 1/2] cifs: convert to add_to_page_cache()
Date: Thu, 22 Oct 2020 03:36:00 -0500 [thread overview]
Message-ID: <CAH2r5msOSo2fj4GhJgPm-+z3YFg0osJp-V7u9Tm8Vk9LfDjAow@mail.gmail.com> (raw)
In-Reply-To: <20201021195745.3420101-2-kent.overstreet@gmail.com>
you can add my reviewed-by if you would like
On Thu, Oct 22, 2020 at 1:48 AM Kent Overstreet
<kent.overstreet@gmail.com> wrote:
>
> 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 | 20 ++++----------------
> 1 file changed, 4 insertions(+), 16 deletions(-)
>
> diff --git a/fs/cifs/file.c b/fs/cifs/file.c
> index be46fab4c9..b3ee790532 100644
> --- a/fs/cifs/file.c
> +++ b/fs/cifs/file.c
> @@ -4296,20 +4296,11 @@ 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 +4319,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
>
--
Thanks,
Steve
next prev parent reply other threads:[~2020-10-22 8:36 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-21 19:57 [PATCH v2 0/2] kill add_to_page_cache_locked() Kent Overstreet
2020-10-21 19:57 ` [PATCH v2 1/2] cifs: convert to add_to_page_cache() Kent Overstreet
2020-10-22 8:36 ` Steve French [this message]
2020-11-11 0:52 ` Matthew Wilcox
2020-10-21 19:57 ` [PATCH v2 2/2] fs: kill add_to_page_cache_locked() Kent Overstreet
2020-10-21 20:51 ` Matthew Wilcox
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=CAH2r5msOSo2fj4GhJgPm-+z3YFg0osJp-V7u9Tm8Vk9LfDjAow@mail.gmail.com \
--to=smfrench@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=kent.overstreet@gmail.com \
--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).