diff options
author | Bryan Schumaker <bjschuma@netapp.com> | 2012-07-30 16:05:19 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-07-30 19:05:54 -0400 |
commit | 1179acc6a3e260bc4edc74fa94f6c7908290eaec (patch) | |
tree | f84a56e4cc1ea6347383b29c83df19eae05eea0f /fs/nfs/internal.h | |
parent | ff9099f26645818563c8d396a154c2ce6ee422eb (diff) |
NFS: Only initialize the ACL client in the v3 case
v2 and v4 don't use it, so I create two new nfs_rpc_ops functions to
initialize the ACL client only when we are using v3.
Signed-off-by: Bryan Schumaker <bjschuma@netapp.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/internal.h')
-rw-r--r-- | fs/nfs/internal.h | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h index 3364eccd17ef..2151bafd55b4 100644 --- a/fs/nfs/internal.h +++ b/fs/nfs/internal.h | |||
@@ -187,13 +187,11 @@ extern struct nfs_client *nfs4_find_client_ident(struct net *, int); | |||
187 | extern struct nfs_client * | 187 | extern struct nfs_client * |
188 | nfs4_find_client_sessionid(struct net *, const struct sockaddr *, | 188 | nfs4_find_client_sessionid(struct net *, const struct sockaddr *, |
189 | struct nfs4_sessionid *); | 189 | struct nfs4_sessionid *); |
190 | extern struct nfs_server *nfs_create_server( | 190 | extern struct nfs_server *nfs_create_server(struct nfs_mount_info *, |
191 | const struct nfs_parsed_mount_data *, | ||
192 | struct nfs_fh *, | ||
193 | struct nfs_subversion *); | 191 | struct nfs_subversion *); |
194 | extern struct nfs_server *nfs4_create_server( | 192 | extern struct nfs_server *nfs4_create_server( |
195 | const struct nfs_parsed_mount_data *, | 193 | struct nfs_mount_info *, |
196 | struct nfs_fh *); | 194 | struct nfs_subversion *); |
197 | extern struct nfs_server *nfs4_create_referral_server(struct nfs_clone_mount *, | 195 | extern struct nfs_server *nfs4_create_referral_server(struct nfs_clone_mount *, |
198 | struct nfs_fh *); | 196 | struct nfs_fh *); |
199 | extern void nfs_free_server(struct nfs_server *server); | 197 | extern void nfs_free_server(struct nfs_server *server); |
@@ -225,6 +223,13 @@ static inline void nfs_fs_proc_exit(void) | |||
225 | int nfs_sockaddr_match_ipaddr(const struct sockaddr *, const struct sockaddr *); | 223 | int nfs_sockaddr_match_ipaddr(const struct sockaddr *, const struct sockaddr *); |
226 | #endif | 224 | #endif |
227 | 225 | ||
226 | /* nfs3client.c */ | ||
227 | #ifdef CONFIG_NFS_V3 | ||
228 | struct nfs_server *nfs3_create_server(struct nfs_mount_info *, struct nfs_subversion *); | ||
229 | struct nfs_server *nfs3_clone_server(struct nfs_server *, struct nfs_fh *, | ||
230 | struct nfs_fattr *, rpc_authflavor_t); | ||
231 | #endif | ||
232 | |||
228 | /* callback_xdr.c */ | 233 | /* callback_xdr.c */ |
229 | extern struct svc_version nfs4_callback_version1; | 234 | extern struct svc_version nfs4_callback_version1; |
230 | extern struct svc_version nfs4_callback_version4; | 235 | extern struct svc_version nfs4_callback_version4; |