lkml.org 
[lkml]   [2010]   [May]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH tip/core/rcu 36/48] nfs: __rcu annotations
    Date
    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>
    ---
    fs/nfs/delegation.h | 2 +-
    include/linux/nfs_fs.h | 2 +-
    include/linux/sunrpc/auth_gss.h | 4 ++--
    3 files changed, 4 insertions(+), 4 deletions(-)

    diff --git a/fs/nfs/delegation.h b/fs/nfs/delegation.h
    index 69e7b81..2978814 100644
    --- a/fs/nfs/delegation.h
    +++ b/fs/nfs/delegation.h
    @@ -14,7 +14,7 @@
    */
    struct nfs_delegation {
    struct list_head super_list;
    - struct rpc_cred *cred;
    + struct rpc_cred __rcu *cred;
    struct inode *inode;
    nfs4_stateid stateid;
    fmode_t type;
    diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h
    index 1a0b85a..3cc4fb6 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 d48d4e6..994db5a 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 char gc_machine_cred : 1;
    };
    --
    1.7.0


    \
     
     \ /
      Last update: 2010-05-04 22:29    [W:0.020 / U:120.216 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site