aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChuck Lever <chuck.lever@oracle.com>2008-12-04 14:20:53 -0500
committerJ. Bruce Fields <bfields@citi.umich.edu>2009-01-06 11:53:51 -0500
commit9fee49024ed19d849413df4ab6ec1a1a60aaae94 (patch)
treefc3830479d06275ac28ced9751bdcd3662ee3a34
parent29ed1407ed81086b778ebf12145b048ac3f7e10e (diff)
NSM: Use sm_name instead of h_name in nsm_monitor() and nsm_unmonitor()
Clean up: Use the sm_name field for reporting the hostname in nsm_monitor() and nsm_unmonitor(), just as the other functions in fs/lockd/mon.c do. The h_name field is just a copy of the sm_name pointer. Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
-rw-r--r--fs/lockd/mon.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/lockd/mon.c b/fs/lockd/mon.c
index a606fbbf804d..697bdcdd20cc 100644
--- a/fs/lockd/mon.c
+++ b/fs/lockd/mon.c
@@ -79,7 +79,7 @@ nsm_monitor(struct nlm_host *host)
79 struct nsm_res res; 79 struct nsm_res res;
80 int status; 80 int status;
81 81
82 dprintk("lockd: nsm_monitor(%s)\n", host->h_name); 82 dprintk("lockd: nsm_monitor(%s)\n", nsm->sm_name);
83 BUG_ON(nsm == NULL); 83 BUG_ON(nsm == NULL);
84 84
85 if (nsm->sm_monitored) 85 if (nsm->sm_monitored)
@@ -94,7 +94,7 @@ nsm_monitor(struct nlm_host *host)
94 status = nsm_mon_unmon(nsm, SM_MON, &res); 94 status = nsm_mon_unmon(nsm, SM_MON, &res);
95 95
96 if (status < 0 || res.status != 0) 96 if (status < 0 || res.status != 0)
97 printk(KERN_NOTICE "lockd: cannot monitor %s\n", host->h_name); 97 printk(KERN_NOTICE "lockd: cannot monitor %s\n", nsm->sm_name);
98 else 98 else
99 nsm->sm_monitored = 1; 99 nsm->sm_monitored = 1;
100 return status; 100 return status;
@@ -116,12 +116,12 @@ nsm_unmonitor(struct nlm_host *host)
116 116
117 if (atomic_read(&nsm->sm_count) == 1 117 if (atomic_read(&nsm->sm_count) == 1
118 && nsm->sm_monitored && !nsm->sm_sticky) { 118 && nsm->sm_monitored && !nsm->sm_sticky) {
119 dprintk("lockd: nsm_unmonitor(%s)\n", host->h_name); 119 dprintk("lockd: nsm_unmonitor(%s)\n", nsm->sm_name);
120 120
121 status = nsm_mon_unmon(nsm, SM_UNMON, &res); 121 status = nsm_mon_unmon(nsm, SM_UNMON, &res);
122 if (status < 0) 122 if (status < 0)
123 printk(KERN_NOTICE "lockd: cannot unmonitor %s\n", 123 printk(KERN_NOTICE "lockd: cannot unmonitor %s\n",
124 host->h_name); 124 nsm->sm_name);
125 else 125 else
126 nsm->sm_monitored = 0; 126 nsm->sm_monitored = 0;
127 } 127 }