From: Chuck Lever <chuck.lever@oracle.com>
Date: Thu, 4 Dec 2008 19:21:46 +0000 (-0500)
Subject: NSM: Check result of SM_UNMON upcall
X-Git-Tag: v2.6.29-rc1~177^2~44
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=0c7aef4569f8680951b7dee01dddffb9d2f809ff;p=linux-2.6-omap-h63xx.git

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>
---

diff --git a/fs/lockd/mon.c b/fs/lockd/mon.c
index d61cdc61cb5..3bb71e1b1e1 100644
--- a/fs/lockd/mon.c
+++ b/fs/lockd/mon.c
@@ -126,6 +126,8 @@ void nsm_unmonitor(const struct nlm_host *host)
 		dprintk("lockd: nsm_unmonitor(%s)\n", nsm->sm_name);
 
 		status = nsm_mon_unmon(nsm, SM_UNMON, &res);
+		if (res.status != 0)
+			status = -EIO;
 		if (status < 0)
 			printk(KERN_NOTICE "lockd: cannot unmonitor %s\n",
 					nsm->sm_name);