From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Mon, 15 Oct 2012 21:21:04 +0000 (-0400)
Subject: lockd: Remove trivial BUG_ON()s from the NSM code
X-Git-Tag: firefly_0821_release~3680^2~1413^2~89
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=326ce0a6da64df3eb8f13a623304ab8033d38c12;p=firefly-linux-kernel-4.4.55.git

lockd: Remove trivial BUG_ON()s from the NSM code

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
---

diff --git a/fs/lockd/mon.c b/fs/lockd/mon.c
index 3d7e09bcc0e9..3c2cfc683631 100644
--- a/fs/lockd/mon.c
+++ b/fs/lockd/mon.c
@@ -154,8 +154,6 @@ static int nsm_mon_unmon(struct nsm_handle *nsm, u32 proc, struct nsm_res *res,
 		.rpc_resp	= res,
 	};
 
-	BUG_ON(clnt == NULL);
-
 	memset(res, 0, sizeof(*res));
 
 	msg.rpc_proc = &clnt->cl_procinfo[proc];
@@ -466,7 +464,6 @@ static void encode_nsm_string(struct xdr_stream *xdr, const char *string)
 	const u32 len = strlen(string);
 	__be32 *p;
 
-	BUG_ON(len > SM_MAXSTRLEN);
 	p = xdr_reserve_space(xdr, 4 + len);
 	xdr_encode_opaque(p, string, len);
 }