2022-08-08 14:45:47

by David Howells

Subject: [PATCH] cifs: Remove {cifs,nfs}_fscache_release_page()

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 <[email protected]>
Signed-off-by: David Howells <[email protected]>
cc: Jeff Layton <[email protected]>
cc: Steve French <[email protected]>
cc: [email protected]
cc: [email protected]
cc: [email protected]
---

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 */

2022-08-08 15:31:48

by Jeff Layton

Subject: Re: [PATCH] cifs: Remove {cifs,nfs}_fscache_release_page()

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 <[email protected]>
> Signed-off-by: David Howells <[email protected]>
> cc: Jeff Layton <[email protected]>
> cc: Steve French <[email protected]>
> cc: [email protected]
> cc: [email protected]
> cc: [email protected]
> ---
>
> 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 <[email protected]>

2022-08-11 02:59:09

by Steve French

Subject: Re: [PATCH] cifs: Remove {cifs,nfs}_fscache_release_page()

merged into cifs-2.6.git for-next

On Mon, Aug 8, 2022 at 9:51 AM Jeff Layton <[email protected]> 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 <[email protected]>
> > Signed-off-by: David Howells <[email protected]>
> > cc: Jeff Layton <[email protected]>
> > cc: Steve French <[email protected]>
> > cc: [email protected]
> > cc: [email protected]
> > cc: [email protected]
> > ---
> >
> > 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 <[email protected]>



--
Thanks,

Steve