diff --git a/[refs] b/[refs]
index 714fb1066033..b273bfc28a6c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5bc74bef7c9b652f0f2aa9c5a8d5ac86881aba79
+refs/heads/master: 5d254b119823658cc318f88589c6c426b3d0a153
diff --git a/trunk/fs/lockd/mon.c b/trunk/fs/lockd/mon.c
index bb5fc1bb37f7..07e16b81498d 100644
--- a/trunk/fs/lockd/mon.c
+++ b/trunk/fs/lockd/mon.c
@@ -91,8 +91,9 @@ nsm_monitor(struct nlm_host *host)
 	nsm->sm_mon_name = nsm_use_hostnames ? nsm->sm_name : nsm->sm_addrbuf;
 
 	status = nsm_mon_unmon(nsm, SM_MON, &res);
-
-	if (status < 0 || res.status != 0)
+	if (res.status != 0)
+		status = -EIO;
+	if (status < 0)
 		printk(KERN_NOTICE "lockd: cannot monitor %s\n", nsm->sm_name);
 	else
 		nsm->sm_monitored = 1;