From: Olof Johansson Subject: Re: [GIT] NFS client fixes for 2.6.23++ Date: Fri, 19 Oct 2007 20:41:49 -0500 Message-ID: <20071020014149.GA19871@lixom.net> References: <1192828993.7466.18.camel@heimdal.trondhjem.org> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Cc: Linus Torvalds , nfs@lists.sourceforge.net, linux-kernel@vger.kernel.org To: Trond Myklebust Return-path: Received: from sc8-sf-mx1-b.sourceforge.net ([10.3.1.91] helo=mail.sourceforge.net) by sc8-sf-list2-new.sourceforge.net with esmtp (Exim 4.43) id 1Ij3FH-0001Ro-B7 for nfs@lists.sourceforge.net; Fri, 19 Oct 2007 18:35:19 -0700 Received: from lixom.net ([66.141.50.11] helo=mail.lixom.net) by mail.sourceforge.net with esmtp (Exim 4.44) id 1Ij3FK-00007S-Ja for nfs@lists.sourceforge.net; Fri, 19 Oct 2007 18:35:24 -0700 In-Reply-To: <1192828993.7466.18.camel@heimdal.trondhjem.org> List-Id: "Discussion of NFS under Linux development, interoperability, and testing." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: nfs-bounces@lists.sourceforge.net Errors-To: nfs-bounces@lists.sourceforge.net nfs: Fix build break with CONFIG_NFS_V4=n Signed-off-by: Olof Johansson --- 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@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/nfs