diff options
| author | Chuck Lever <chuck.lever@oracle.com> | 2010-01-14 12:24:30 -0500 |
|---|---|---|
| committer | Steve Dickson <steved@redhat.com> | 2010-01-15 14:55:52 -0500 |
| commit | d16bd0400fc096ec2fed36d5dfa8620b2370e4d1 (patch) | |
| tree | d37af63dfb2f8922179321ba8ad59307f3164c81 /utils/statd/monitor.c | |
| parent | 17d144b236c84150c2ca896c0d3eea05931d938e (diff) | |
| download | nfs-utils-d16bd0400fc096ec2fed36d5dfa8620b2370e4d1.tar.gz nfs-utils-d16bd0400fc096ec2fed36d5dfa8620b2370e4d1.tar.xz nfs-utils-d16bd0400fc096ec2fed36d5dfa8620b2370e4d1.zip | |
statd: Remove NL_ADDR() macro
Clean up: The contents of NL_ADDR are fixed: they are always the IPv4
loopback address. Some time ago, the use of NL_ADDR() was stubbed out
of the NLM downcall forward path, replaced with a constant IPv4
loopback address.
Stub it out of the reply path as well, and then remove NL_ADDR
entirely.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Diffstat (limited to 'utils/statd/monitor.c')
| -rw-r--r-- | utils/statd/monitor.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/utils/statd/monitor.c b/utils/statd/monitor.c index 11afe08..325dfd3 100644 --- a/utils/statd/monitor.c +++ b/utils/statd/monitor.c @@ -173,7 +173,6 @@ sm_mon_1_svc(struct mon *argp, struct svc_req *rqstp) goto failure; } - NL_ADDR(clnt) = my_addr.sin_addr; NL_MY_PROG(clnt) = id->my_prog; NL_MY_VERS(clnt) = id->my_vers; NL_MY_PROC(clnt) = id->my_proc; @@ -214,11 +213,11 @@ failure: } static unsigned int -load_one_host(const char *hostname, const struct sockaddr *sap, +load_one_host(const char *hostname, + __attribute__ ((unused)) const struct sockaddr *sap, const struct mon *m, __attribute__ ((unused)) const time_t timestamp) { - const struct sockaddr_in *sin = (const struct sockaddr_in *)sap; notify_list *clnt; clnt = nlist_new(m->mon_id.my_id.my_name, @@ -235,7 +234,6 @@ load_one_host(const char *hostname, const struct sockaddr *sap, xlog(D_GENERAL, "Adding record for %s to the monitor list...", hostname); - NL_ADDR(clnt) = sin->sin_addr; NL_MY_PROG(clnt) = m->mon_id.my_id.my_prog; NL_MY_VERS(clnt) = m->mon_id.my_id.my_vers; NL_MY_PROC(clnt) = m->mon_id.my_id.my_proc; |