lkml.org 
[lkml]   [2010]   [Jul]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [PATCH RFC tip/core/rcu 07/30] nfs: __rcu annotations
From
Date
On Wed, 2010-07-14 at 13:09 -0700, Paul E. McKenney wrote:
> From: Arnd Bergmann <arnd@arndb.de>
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
> Cc: Trond Myklebust <Trond.Myklebust@netapp.com>

Acked-by: Trond Myklebust <Trond.Myklebust@netapp.com>

> ---
> 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;




\
 
 \ /
  Last update: 2010-07-15 00:11    [W:0.116 / U:0.140 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site