OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
aad56de
)
lockd: Remove trivial BUG_ON()s from the NSM code
author
Trond Myklebust
<Trond.Myklebust@netapp.com>
Mon, 15 Oct 2012 21:21:04 +0000
(17:21 -0400)
committer
Trond Myklebust
<Trond.Myklebust@netapp.com>
Sun, 4 Nov 2012 19:43:39 +0000
(14:43 -0500)
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
fs/lockd/mon.c
patch
|
blob
|
history
diff --git
a/fs/lockd/mon.c
b/fs/lockd/mon.c
index
3d7e09b
..
3c2cfc6
100644
(file)
--- 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);
}