Re: [git:v4l-dvb/master] NFS: Fix a bug in nfs_fscache_release_page()

Re: [git:v4l-dvb/master] NFS: Fix a bug in nfs_fscache_release_page()

[Trond Myklebust]

On Sat, 2010-03-06 at 15:26 +0100, Patch from Trond Myklebust wrote: 
> From: Trond Myklebust <Trond.Myklebust@netapp.com>
> 
> Not having an fscache cookie is perfectly valid if the user didn't mount
> with the fscache option.
> 
> This patch fixes http://bugzilla.kernel.org/show_bug.cgi?id=15234
> 
> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
> Acked-by: David Howells <dhowells@redhat.com>
> Cc: stable@kernel.org
> 
>  fs/nfs/fscache.c |    9 ++++-----
>  1 files changed, 4 insertions(+), 5 deletions(-)
> 
> ---
> 
> http://git.linuxtv.org/v4l-dvb.git?a=commitdiff;h=2c1740098c708b465e87637b237feb2fd98f129a
> 
> diff --git a/fs/nfs/fscache.c b/fs/nfs/fscache.c
> index fa58800..237874f 100644
> --- a/fs/nfs/fscache.c
> +++ b/fs/nfs/fscache.c
> @@ -354,12 +354,11 @@ void nfs_fscache_reset_inode_cookie(struct inode *inode)
>   */
>  int nfs_fscache_release_page(struct page *page, gfp_t gfp)
>  {
> -	struct nfs_inode *nfsi = NFS_I(page->mapping->host);
> -	struct fscache_cookie *cookie = nfsi->fscache;
> -
> -	BUG_ON(!cookie);
> -
>  	if (PageFsCache(page)) {
> +		struct nfs_inode *nfsi = NFS_I(page->mapping->host);
> +		struct fscache_cookie *cookie = nfsi->fscache;
> +
> +		BUG_ON(!cookie);
>  		dfprintk(FSCACHE, "NFS: fscache releasepage (0x%p/0x%p/0x%p)\n",
>  			 cookie, page, nfsi);
>  

Err.... Why are we receiving this email? This changeset is already
committed upstream in Linus' tree and has nothing to do with V4L/DVB.

Trond