Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
MIME-Version: 1.0
References: <165996923111.209242.10532553567023183407.stgit@warthog.procyon.org.uk>
 <c4e26f69d38c4294038430487bf10e88fa980e0b.camel@kernel.org>
In-Reply-To: <c4e26f69d38c4294038430487bf10e88fa980e0b.camel@kernel.org>
From:   Steve French <smfrench@gmail.com>
Date:   Wed, 10 Aug 2022 21:27:00 -0500
Message-ID: <CAH2r5mubvk83SkDmiw0YUW2W6g0o7-Q3hr1KKtOC1DRRP6yOcQ@mail.gmail.com>
Subject: Re: [PATCH] cifs: Remove {cifs,nfs}_fscache_release_page()
To:     Jeff Layton <jlayton@kernel.org>
Cc:     David Howells <dhowells@redhat.com>,
        Matthew Wilcox <willy@infradead.org>,
        CIFS <linux-cifs@vger.kernel.org>,
        samba-technical <samba-technical@lists.samba.org>,
        linux-fsdevel <linux-fsdevel@vger.kernel.org>,
        LKML <linux-kernel@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

merged into cifs-2.6.git for-next

On Mon, Aug 8, 2022 at 9:51 AM Jeff Layton <jlayton@kernel.org> wrote:
>
> On Mon, 2022-08-08 at 15:33 +0100, David Howells wrote:
> > Remove {cifs,nfs}_fscache_release_page() from fs/cifs/fscache.h.  This
> > functionality got built directly into cifs_release_folio() and will
> > hopefully be replaced with netfs_release_folio() at some point.
> >
> > The "nfs_" version is a copy and paste error and should've been altered to
> > read "cifs_".  That can also be removed.
> >
> > Reported-by: Matthew Wilcox <willy@infradead.org>
> > Signed-off-by: David Howells <dhowells@redhat.com>
> > cc: Jeff Layton <jlayton@redhat.com>
> > cc: Steve French <smfrench@gmail.com>
> > cc: linux-cifs@vger.kernel.org
> > cc: samba-technical@lists.samba.org
> > cc: linux-fsdevel@vger.kernel.org
> > ---
> >
> >  fs/cifs/fscache.h |   16 ----------------
> >  1 file changed, 16 deletions(-)
> >
> > diff --git a/fs/cifs/fscache.h b/fs/cifs/fscache.h
> > index aa3b941a5555..67b601041f0a 100644
> > --- a/fs/cifs/fscache.h
> > +++ b/fs/cifs/fscache.h
> > @@ -108,17 +108,6 @@ static inline void cifs_readpage_to_fscache(struct inode *inode,
> >               __cifs_readpage_to_fscache(inode, page);
> >  }
> >
> > -static inline int cifs_fscache_release_page(struct page *page, gfp_t gfp)
> > -{
> > -     if (PageFsCache(page)) {
> > -             if (current_is_kswapd() || !(gfp & __GFP_FS))
> > -                     return false;
> > -             wait_on_page_fscache(page);
> > -             fscache_note_page_release(cifs_inode_cookie(page->mapping->host));
> > -     }
> > -     return true;
> > -}
> > -
> >  #else /* CONFIG_CIFS_FSCACHE */
> >  static inline
> >  void cifs_fscache_fill_coherency(struct inode *inode,
> > @@ -154,11 +143,6 @@ cifs_readpage_from_fscache(struct inode *inode, struct page *page)
> >  static inline
> >  void cifs_readpage_to_fscache(struct inode *inode, struct page *page) {}
> >
> > -static inline int nfs_fscache_release_page(struct page *page, gfp_t gfp)
> > -{
> > -     return true; /* May release page */
> > -}
> > -
> >  #endif /* CONFIG_CIFS_FSCACHE */
> >
> >  #endif /* _CIFS_FSCACHE_H */
> >
> >
>
> Reviewed-by: Jeff Layton <jlayton@kernel.org>


-- 
Thanks,

Steve