From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757633Ab0GNWIE (ORCPT ); Wed, 14 Jul 2010 18:08:04 -0400 Received: from mx2.netapp.com ([216.240.18.37]:41878 "EHLO mx2.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754522Ab0GNWIB convert rfc822-to-8bit (ORCPT ); Wed, 14 Jul 2010 18:08:01 -0400 X-IronPort-AV: E=Sophos;i="4.55,204,1278313200"; d="scan'208";a="403057718" Subject: Re: [PATCH RFC tip/core/rcu 07/30] nfs: __rcu annotations From: Trond Myklebust To: "Paul E. McKenney" Cc: linux-kernel@vger.kernel.org, mingo@elte.hu, laijs@cn.fujitsu.com, dipankar@in.ibm.com, akpm@linux-foundation.org, mathieu.desnoyers@polymtl.ca, josh@joshtriplett.org, dvhltc@us.ibm.com, niv@us.ibm.com, tglx@linutronix.de, peterz@infradead.org, rostedt@goodmis.org, Valdis.Kletnieks@vt.edu, dhowells@redhat.com, eric.dumazet@gmail.com, Arnd Bergmann In-Reply-To: <1279138204-12849-7-git-send-email-paulmck@linux.vnet.ibm.com> References: <20100714200945.GA10535@linux.vnet.ibm.com> <1279138204-12849-7-git-send-email-paulmck@linux.vnet.ibm.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8BIT Organization: NetApp Date: Wed, 14 Jul 2010 18:07:28 -0400 Message-ID: <1279145248.9967.59.camel@heimdal.trondhjem.org> Mime-Version: 1.0 X-Mailer: Evolution 2.30.2 (2.30.2-1.fc13) X-OriginalArrivalTime: 14 Jul 2010 22:07:58.0878 (UTC) FILETIME=[04E16BE0:01CB23A1] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 2010-07-14 at 13:09 -0700, Paul E. McKenney wrote: > From: Arnd Bergmann > > Signed-off-by: Arnd Bergmann > Signed-off-by: Paul E. McKenney > Cc: Trond Myklebust Acked-by: Trond Myklebust > --- > include/linux/nfs_fs.h | 2 +- > include/linux/sunrpc/auth_gss.h | 4 ++-- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h > index 77c2ae5..a619070 100644 > --- a/include/linux/nfs_fs.h > +++ b/include/linux/nfs_fs.h > @@ -178,7 +178,7 @@ struct nfs_inode { > struct nfs4_cached_acl *nfs4_acl; > /* NFSv4 state */ > struct list_head open_states; > - struct nfs_delegation *delegation; > + struct nfs_delegation __rcu *delegation; > fmode_t delegation_state; > struct rw_semaphore rwsem; > #endif /* CONFIG_NFS_V4*/ > diff --git a/include/linux/sunrpc/auth_gss.h b/include/linux/sunrpc/auth_gss.h > index 671538d..8eee9db 100644 > --- a/include/linux/sunrpc/auth_gss.h > +++ b/include/linux/sunrpc/auth_gss.h > @@ -69,7 +69,7 @@ struct gss_cl_ctx { > enum rpc_gss_proc gc_proc; > u32 gc_seq; > spinlock_t gc_seq_lock; > - struct gss_ctx *gc_gss_ctx; > + struct gss_ctx __rcu *gc_gss_ctx; > struct xdr_netobj gc_wire_ctx; > u32 gc_win; > unsigned long gc_expiry; > @@ -80,7 +80,7 @@ struct gss_upcall_msg; > struct gss_cred { > struct rpc_cred gc_base; > enum rpc_gss_svc gc_service; > - struct gss_cl_ctx *gc_ctx; > + struct gss_cl_ctx __rcu *gc_ctx; > struct gss_upcall_msg *gc_upcall; > unsigned long gc_upcall_timestamp; > unsigned char gc_machine_cred : 1;