diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2012-06-12 14:28:48 +0200 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2012-06-14 19:54:08 +0200 |
| commit | bc2df47a408f2d64cf81bcfd0f6e3e14c84cb0ab (patch) | |
| tree | 6c5c72d2498fd2003ab9499d1a9859480dd067b1 /fs/nfsd | |
| parent | NFS: hard-code init_net for NFS callback transports (diff) | |
| download | linux-bc2df47a408f2d64cf81bcfd0f6e3e14c84cb0ab.tar.xz linux-bc2df47a408f2d64cf81bcfd0f6e3e14c84cb0ab.zip | |
nfsd4: BUG_ON(!is_spin_locked()) no good on UP kernels
Most frequent symptom was a BUG triggering in expire_client, with the
server locking up shortly thereafter.
Introduced by 508dc6e110c6dbdc0bbe84298ccfe22de7538486 "nfsd41:
free_session/free_client must be called under the client_lock".
Cc: stable@kernel.org
Cc: Benny Halevy <bhalevy@tonian.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd')
| -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 8fdc9ec5c5d3..94effd5bc4a1 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -900,7 +900,7 @@ static void free_session(struct kref *kref) struct nfsd4_session *ses; int mem; - BUG_ON(!spin_is_locked(&client_lock)); + lockdep_assert_held(&client_lock); ses = container_of(kref, struct nfsd4_session, se_ref); nfsd4_del_conns(ses); spin_lock(&nfsd_drc_lock); @@ -1080,7 +1080,7 @@ static struct nfs4_client *alloc_client(struct xdr_netobj name) static inline void free_client(struct nfs4_client *clp) { - BUG_ON(!spin_is_locked(&client_lock)); + lockdep_assert_held(&client_lock); while (!list_empty(&clp->cl_sessions)) { struct nfsd4_session *ses; ses = list_entry(clp->cl_sessions.next, struct nfsd4_session, |