Re: [NFS] [GIT] NFS client fixes for 2.6.23++

[Trond Myklebust]

On Fri, 2007-10-19 at 20:41 -0500, Olof Johansson wrote:
> nfs: Fix build break with CONFIG_NFS_V4=n
> 
> Signed-off-by: Olof Johansson <olof@xxxxxxxxx>

Acked-by: Trond Myklebust <Trond.Myklebust@xxxxxxxxxx>

....with apologies.

> ---
> 
> 
> On Fri, Oct 19, 2007 at 05:23:13PM -0400, Trond Myklebust wrote:
> > Hi Linus,
> > 
> > Please pull from the repository at
> > 
> >    git pull git://git.linux-nfs.org/pub/linux/nfs-2.6.git
> > 
> > This will update the following files through the appended changesets.
> > 
> [...]
> > @@ -522,8 +522,12 @@ void put_nfs_open_context(struct nfs_open_context *ctx)
> >  		return;
> >  	list_del(&ctx->list);
> >  	spin_unlock(&inode->i_lock);
> > -	if (ctx->state != NULL)
> > -		nfs4_close_state(&ctx->path, ctx->state, ctx->mode);
> > +	if (ctx->state != NULL) {
> > +		if (wait)
> > +			nfs4_close_sync(&ctx->path, ctx->state, ctx->mode);
> > +		else
> > +			nfs4_close_state(&ctx->path, ctx->state, ctx->mode);
> > +	}
> >  	if (ctx->cred != NULL)
> >  		put_rpccred(ctx->cred);
> >  	dput(ctx->path.dentry);
> 
> This gives me build errors on most PPC defconfigs, which don't enable NFSv4.
> 
> This seems sufficient to fix it.
> 
> 
> diff --git a/fs/nfs/nfs4_fs.h b/fs/nfs/nfs4_fs.h
> index a4e3b96..b35069a 100644
> --- a/fs/nfs/nfs4_fs.h
> +++ b/fs/nfs/nfs4_fs.h
> @@ -236,6 +236,7 @@ extern struct svc_version nfs4_callback_version1;
>  #else
>  
>  #define nfs4_close_state(a, b, c) do { } while (0)
> +#define nfs4_close_sync(a, b, c) do { } while (0)
>  
>  #endif /* CONFIG_NFS_V4 */
>  #endif /* __LINUX_FS_NFS_NFS4_FS.H */
> 
> -------------------------------------------------------------------------
> This SF.net email is sponsored by: Splunk Inc.
> Still grepping through log files to find problems?  Stop.
> Now Search log events and configuration files using AJAX and a browser.
> Download your FREE copy of Splunk now >> http://get.splunk.com/
> _______________________________________________
> NFS maillist  -  NFS@xxxxxxxxxxxxxxxxxxxxx
> https://lists.sourceforge.net/lists/listinfo/nfs
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/