diff options
| author | Chuck Lever <chuck.lever@oracle.com> | 2009-03-18 20:46:06 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2009-03-28 15:54:12 -0400 |
| commit | 4b62e58cccff9c5e7ffc7023f7ec24c75fbd549b (patch) | |
| tree | 34965810fe2a9aff001dd193a3cb925c2c3e1abd /net/sunrpc/svcsock.c | |
| parent | 156e62094a74cf43f02f56ef96b6cda567501357 (diff) | |
| download | linux-3.10-4b62e58cccff9c5e7ffc7023f7ec24c75fbd549b.tar.gz linux-3.10-4b62e58cccff9c5e7ffc7023f7ec24c75fbd549b.tar.bz2 linux-3.10-4b62e58cccff9c5e7ffc7023f7ec24c75fbd549b.zip | |
SUNRPC: Pass a family argument to svc_register()
The sv_family field is going away. Instead of using sv_family, have
the svc_register() function take a protocol family argument.
Since this argument represents a protocol family, and not an address
family, this argument takes an int, as this is what is passed to
sock_create_kern(). Also make sure svc_register's helpers are
checking for PF_FOO instead of AF_FOO. The value of [AP]F_FOO are
equivalent; this is simply a symbolic change to reflect the semantics
of the value stored in that variable.
sock_create_kern() should return EPFNOSUPPORT if the passed-in
protocol family isn't supported, but it uses EAFNOSUPPORT for this
case. We will stick with that tradition here, as svc_register()
is called by the RPC server in the same path as sock_create_kern().
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'net/sunrpc/svcsock.c')
| -rw-r--r-- | net/sunrpc/svcsock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c index 5763e6460fe..d00583c1cd0 100644 --- a/net/sunrpc/svcsock.c +++ b/net/sunrpc/svcsock.c @@ -1122,7 +1122,7 @@ static struct svc_sock *svc_setup_socket(struct svc_serv *serv, /* Register socket with portmapper */ if (*errp >= 0 && pmap_register) - *errp = svc_register(serv, inet->sk_protocol, + *errp = svc_register(serv, serv->sv_family, inet->sk_protocol, ntohs(inet_sk(inet)->sport)); if (*errp < 0) { |