diff --git a/[refs] b/[refs] index dd804925871f..682e727ebeee 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 356c3eb466fd1a12afd6448d90fba3922836e5f1 +refs/heads/master: 0c7aef4569f8680951b7dee01dddffb9d2f809ff diff --git a/trunk/fs/lockd/mon.c b/trunk/fs/lockd/mon.c index d61cdc61cb50..3bb71e1b1e1f 100644 --- a/trunk/fs/lockd/mon.c +++ b/trunk/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);