summaryrefslogtreecommitdiff
path: root/fs/nfs
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2012-11-21 22:49:36 -0500
committerTrond Myklebust <Trond.Myklebust@netapp.com>2012-11-21 22:59:28 -0500
commitfe20d7d5eefb218b82033ba5c13cbcbd2a3d874c (patch)
tree2444ac6db476af8b5abd2e8a98777ab1a537ff2f /fs/nfs
parent642fe4d00db56d65060ce2fd4c105884414acb16 (diff)
downloadlinux-3.10-fe20d7d5eefb218b82033ba5c13cbcbd2a3d874c.tar.gz
linux-3.10-fe20d7d5eefb218b82033ba5c13cbcbd2a3d874c.tar.bz2
linux-3.10-fe20d7d5eefb218b82033ba5c13cbcbd2a3d874c.zip
NFSv4: Fix a compile time warning when #undef CONFIG_NFS_V4_1
The function nfs4_get_machine_cred_locked is used by NFSv4.0 routines too. Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs')
-rw-r--r--fs/nfs/nfs4_fs.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/nfs4_fs.h b/fs/nfs/nfs4_fs.h
index a525fdefccd..ea4e3624104 100644
--- a/fs/nfs/nfs4_fs.h
+++ b/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 *);