From 472f515ded219ccab8a39cc54df78d798981756a Mon Sep 17 00:00:00 2001 From: Trond Myklebust Date: Wed, 21 Nov 2012 22:49:36 -0500 Subject: [PATCH] --- yaml --- r: 346615 b: refs/heads/master c: fe20d7d5eefb218b82033ba5c13cbcbd2a3d874c h: refs/heads/master i: 346613: bfe6f63e9aa4e15a523ca7385e652028ceb8a679 346611: 055d92efe05de27ea71f80d8a0be23c2c510bb1b 346607: 608ddbc289ade05f89319d3be843f92d43f6c0ee v: v3 --- [refs] | 2 +- trunk/fs/nfs/nfs4_fs.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ab11e9f40ada..577fca1d2059 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 642fe4d00db56d65060ce2fd4c105884414acb16 +refs/heads/master: fe20d7d5eefb218b82033ba5c13cbcbd2a3d874c diff --git a/trunk/fs/nfs/nfs4_fs.h b/trunk/fs/nfs/nfs4_fs.h index a525fdefccde..ea4e36241044 100644 --- a/trunk/fs/nfs/nfs4_fs.h +++ b/trunk/fs/nfs/nfs4_fs.h @@ -321,13 +321,13 @@ extern void nfs4_renew_state(struct work_struct *); /* nfs4state.c */ struct rpc_cred *nfs4_get_setclientid_cred(struct nfs_client *clp); +struct rpc_cred *nfs4_get_machine_cred_locked(struct nfs_client *clp); struct rpc_cred *nfs4_get_renew_cred_locked(struct nfs_client *clp); int nfs4_discover_server_trunking(struct nfs_client *clp, struct nfs_client **); int nfs40_discover_server_trunking(struct nfs_client *clp, struct nfs_client **, struct rpc_cred *); #if defined(CONFIG_NFS_V4_1) -struct rpc_cred *nfs4_get_machine_cred_locked(struct nfs_client *clp); struct rpc_cred *nfs4_get_exchange_id_cred(struct nfs_client *clp); int nfs41_discover_server_trunking(struct nfs_client *clp, struct nfs_client **, struct rpc_cred *);