aboutsummaryrefslogtreecommitdiffstats
path: root/fs/lockd
diff options
context:
space:
mode:
authorChuck Lever <chuck.lever@oracle.com>2008-12-04 14:21:46 -0500
committerJ. Bruce Fields <bfields@citi.umich.edu>2009-01-06 11:53:52 -0500
commit0c7aef4569f8680951b7dee01dddffb9d2f809ff (patch)
tree04a78e99cf53549dd8d32d6dbab5923f4f212f8d /fs/lockd
parent356c3eb466fd1a12afd6448d90fba3922836e5f1 (diff)
NSM: Check result of SM_UNMON upcall
Make sure any error returned by rpc.statd during an SM_UNMON call is reported rather than ignored completely. There isn't much to do with such an error, but we should log it in any case. Similar to a recent change to nsm_monitor(). Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Diffstat (limited to 'fs/lockd')
-rw-r--r--fs/lockd/mon.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/lockd/mon.c b/fs/lockd/mon.c
index d61cdc61cb50..3bb71e1b1e1f 100644
--- a/fs/lockd/mon.c
+++ b/fs/lockd/mon.c
@@ -126,6 +126,8 @@ void nsm_unmonitor(const struct nlm_host *host)
126 dprintk("lockd: nsm_unmonitor(%s)\n", nsm->sm_name); 126 dprintk("lockd: nsm_unmonitor(%s)\n", nsm->sm_name);
127 127
128 status = nsm_mon_unmon(nsm, SM_UNMON, &res); 128 status = nsm_mon_unmon(nsm, SM_UNMON, &res);
129 if (res.status != 0)
130 status = -EIO;
129 if (status < 0) 131 if (status < 0)
130 printk(KERN_NOTICE "lockd: cannot unmonitor %s\n", 132 printk(KERN_NOTICE "lockd: cannot unmonitor %s\n",
131 nsm->sm_name); 133 nsm->sm_name);