diff options
| author | Chuck Lever <chuck.lever@oracle.com> | 2012-05-21 22:45:59 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-05-22 16:45:47 -0400 |
| commit | 8cab4c390b43fe34c07bd33799c1bc24be648122 (patch) | |
| tree | a819ca042219e2764b9042e410ed6f7b4354c59b /include/linux/nfs_xdr.h | |
| parent | f411703adc762a92b72f8a93c6464050d66cb87b (diff) | |
| download | linux-3.10-8cab4c390b43fe34c07bd33799c1bc24be648122.tar.gz linux-3.10-8cab4c390b43fe34c07bd33799c1bc24be648122.tar.bz2 linux-3.10-8cab4c390b43fe34c07bd33799c1bc24be648122.zip | |
NFS: Refactor nfs_get_client(): initialize nfs_client
Clean up: Continue to rationalize the locking in nfs_get_client() by
moving the logic that handles the case where a matching server IP
address is not found.
When we support server trunking detection, client initialization may
return a different nfs_client struct than was passed to it. Change
the synopsis of the init_client methods to return an nfs_client.
The client initialization logic in nfs_get_client() is not much more
than a wrapper around ->init_client. It's simpler to keep the little
bits of error handling in the version-specific init_client methods.
No behavior change is expected.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'include/linux/nfs_xdr.h')
| -rw-r--r-- | include/linux/nfs_xdr.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h index c420b8d60a5..0c521cd496a 100644 --- a/include/linux/nfs_xdr.h +++ b/include/linux/nfs_xdr.h @@ -1397,7 +1397,8 @@ struct nfs_rpc_ops { struct nfs_open_context *ctx, int open_flags, struct iattr *iattr); - int (*init_client) (struct nfs_client *, const struct rpc_timeout *, + struct nfs_client * + (*init_client) (struct nfs_client *, const struct rpc_timeout *, const char *, rpc_authflavor_t, int); }; |