diff options
author | Naofumi Honda <honda@math.sci.hokudai.ac.jp> | 2017-11-09 10:57:16 -0500 |
---|---|---|
committer | J. Bruce Fields <bfields@redhat.com> | 2017-11-27 16:45:11 -0500 |
commit | 64ebe12494fd5d193f014ce38e1fd83cc57883c8 (patch) | |
tree | 5f527daa9b47ed2cfc921ae4be5b9569b8ab9cc3 | |
parent | 3a2b19d1ee5633f76ae8a88da7bc039a5d1732aa (diff) |
nfsd: fix panic in posix_unblock_lock called from nfs4_laundromat
From kernel 4.9, my two nfsv4 servers sometimes suffer from
"panic: unable to handle kernel page request"
in posix_unblock_lock() called from nfs4_laundromat().
These panics diseappear if we revert the commit "nfsd: add a LRU list
for blocked locks".
The cause appears to be a typo in nfs4_laundromat(), which is also
present in nfs4_state_shutdown_net().
Cc: stable@vger.kernel.org
Fixes: 7919d0a27f1e "nfsd: add a LRU list for blocked locks"
Cc: jlayton@redhat.com
Reveiwed-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
-rw-r--r-- | fs/nfsd/nfs4state.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 98342d262771..d0992d59f4e1 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c | |||
@@ -4790,7 +4790,7 @@ nfs4_laundromat(struct nfsd_net *nn) | |||
4790 | spin_unlock(&nn->blocked_locks_lock); | 4790 | spin_unlock(&nn->blocked_locks_lock); |
4791 | 4791 | ||
4792 | while (!list_empty(&reaplist)) { | 4792 | while (!list_empty(&reaplist)) { |
4793 | nbl = list_first_entry(&nn->blocked_locks_lru, | 4793 | nbl = list_first_entry(&reaplist, |
4794 | struct nfsd4_blocked_lock, nbl_lru); | 4794 | struct nfsd4_blocked_lock, nbl_lru); |
4795 | list_del_init(&nbl->nbl_lru); | 4795 | list_del_init(&nbl->nbl_lru); |
4796 | posix_unblock_lock(&nbl->nbl_lock); | 4796 | posix_unblock_lock(&nbl->nbl_lock); |
@@ -7236,7 +7236,7 @@ nfs4_state_shutdown_net(struct net *net) | |||
7236 | spin_unlock(&nn->blocked_locks_lock); | 7236 | spin_unlock(&nn->blocked_locks_lock); |
7237 | 7237 | ||
7238 | while (!list_empty(&reaplist)) { | 7238 | while (!list_empty(&reaplist)) { |
7239 | nbl = list_first_entry(&nn->blocked_locks_lru, | 7239 | nbl = list_first_entry(&reaplist, |
7240 | struct nfsd4_blocked_lock, nbl_lru); | 7240 | struct nfsd4_blocked_lock, nbl_lru); |
7241 | list_del_init(&nbl->nbl_lru); | 7241 | list_del_init(&nbl->nbl_lru); |
7242 | posix_unblock_lock(&nbl->nbl_lock); | 7242 | posix_unblock_lock(&nbl->nbl_lock); |