Commit 84ebf02d authored by Chuck Lever's avatar Chuck Lever
Browse files

NFSD: Remove BUG_ON in nfsd4_process_cb_update() 



Don't kill the kworker thread, and don't panic while cl_lock is
held. There's no need for scorching the earth here.

Reviewed-by: default avatarJeff Layton <jlayton@kernel.org>
Reviewed-by: default avatarBenjamin Coddington <bcodding@redhat.com>
Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
parent 112bdd59

fs/nfsd/nfs4callback.c

+2 −1
Original line number Diff line number Diff line
@@ -1370,8 +1370,9 @@ static void nfsd4_process_cb_update(struct nfsd4_callback *cb) 
	 * Only serialized callback code is allowed to clear these

	 * flags; main nfsd code can only set them:

	 */

	BUG_ON(!(clp->cl_flags & NFSD4_CLIENT_CB_FLAG_MASK));

	WARN_ON(!(clp->cl_flags & NFSD4_CLIENT_CB_FLAG_MASK));

	clear_bit(NFSD4_CLIENT_CB_UPDATE, &clp->cl_flags);



	memcpy(&conn, &cb->cb_clp->cl_cb_conn, sizeof(struct nfs4_cb_conn));

	c = __nfsd4_find_backchannel(clp);

	if (c) {