[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1061016233025.11354@suse.de>
Date: Tue, 17 Oct 2006 09:30:25 +1000
From: NeilBrown <neilb@...e.de>
To: Andrew Morton <akpm@...l.org>
Cc: nfs@...ts.sourceforge.net, linux-kernel@...r.kernel.org
Subject: [PATCH 004 of 5] knfsd: Fix bug in recent lockd patches that can cause reclaim to fail.
When an nfs server shuts down, lockd needs to release all the locks
even though the client still holds them.
It should therefore not 'unmonitor' the clients, so that the files in
nfs/sm will still be there when the nfs server restarts, so that those
clients will be told to reclaim their locks.
However the hosts are fully unmonitored, so statd may well remove the
files.
lockd has a test for 'sm_sticky' and avoid the unmonitor call if it is
set, but it is currently not set.
So set it when tearing down lockd.
Signed-off-by: Neil Brown <neilb@...e.de>
### Diffstat output
./fs/lockd/svcsubs.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff .prev/fs/lockd/svcsubs.c ./fs/lockd/svcsubs.c
--- .prev/fs/lockd/svcsubs.c 2006-10-17 09:10:39.000000000 +1000
+++ ./fs/lockd/svcsubs.c 2006-10-17 09:10:40.000000000 +1000
@@ -324,7 +324,17 @@ nlmsvc_same_host(struct nlm_host *host,
static int
nlmsvc_is_client(struct nlm_host *host, struct nlm_host *dummy)
{
- return host->h_server;
+ if (host->h_server)
+ {
+ /* we are destroying locks even though the client
+ * hasn't asked us too, so don't unmonitor the
+ * client
+ */
+ if (host->h_nsmhandle)
+ host->h_nsmhandle->sm_sticky = 1;
+ return 1;
+ } else
+ return 0;
}
/*
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists