Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1765525AbXJTRX6 (ORCPT ); Sat, 20 Oct 2007 13:23:58 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757203AbXJTRXu (ORCPT ); Sat, 20 Oct 2007 13:23:50 -0400 Received: from mx2.netapp.com ([216.240.18.37]:53303 "EHLO mx2.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757143AbXJTRXt (ORCPT ); Sat, 20 Oct 2007 13:23:49 -0400 X-IronPort-AV: E=Sophos;i="4.21,304,1188802800"; d="scan'208";a="115462320" Subject: Re: [NFS] [GIT] NFS client fixes for 2.6.23++ From: Trond Myklebust To: Olof Johansson Cc: Linus Torvalds , nfs@lists.sourceforge.net, linux-kernel@vger.kernel.org In-Reply-To: <20071020014149.GA19871@lixom.net> References: <1192828993.7466.18.camel@heimdal.trondhjem.org> <20071020014149.GA19871@lixom.net> Content-Type: text/plain Content-Transfer-Encoding: 7bit Organization: Network Appliance Inc Date: Sat, 20 Oct 2007 13:24:05 -0400 Message-Id: <1192901045.7440.11.camel@heimdal.trondhjem.org> Mime-Version: 1.0 X-Mailer: Evolution 2.12.0 X-OriginalArrivalTime: 20 Oct 2007 17:23:48.0923 (UTC) FILETIME=[FA0E40B0:01C8133D] Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2301 Lines: 70 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 Acked-by: Trond Myklebust ....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@lists.sourceforge.net > 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@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/