---

yaml --- r: 346544 b: refs/heads/master c: 326ce0a h: refs/heads/master v: v3
git-mirror · Nov 4, 2012 · 6c4ca6f · 6c4ca6f
1 parent 97e0442
commit 6c4ca6f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aad56de378b4c675e964a1ab44cf2e55d44d2865
+refs/heads/master: 326ce0a6da64df3eb8f13a623304ab8033d38c12
diff --git a/trunk/fs/lockd/mon.c b/trunk/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);
 }