diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2013-02-28 11:55:46 -0800 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2013-04-03 11:47:45 -0400 |
| commit | b600de7ab9288eaf6126561203e0ae340828ab44 (patch) | |
| tree | d084252ad8be7140637ed13579ef97a9ca7e9482 | |
| parent | 0733c7ba1ef0d7e29a11c52f4d1356fc394de334 (diff) | |
| download | blackbird-op-linux-b600de7ab9288eaf6126561203e0ae340828ab44.tar.gz blackbird-op-linux-b600de7ab9288eaf6126561203e0ae340828ab44.zip | |
nfsd4: remove BUG_ON
This BUG_ON just crashes the thread a little earlier than it would
otherwise--it doesn't seem useful.
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
| -rw-r--r-- | fs/nfsd/nfs4proc.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c index ae73175e6e68..c7e4e8c28827 100644 --- a/fs/nfsd/nfs4proc.c +++ b/fs/nfsd/nfs4proc.c @@ -1282,12 +1282,9 @@ nfsd4_proc_compound(struct svc_rqst *rqstp, if (op->status) goto encode_op; - if (opdesc->op_func) { - if (opdesc->op_get_currentstateid) - opdesc->op_get_currentstateid(cstate, &op->u); - op->status = opdesc->op_func(rqstp, cstate, &op->u); - } else - BUG_ON(op->status == nfs_ok); + if (opdesc->op_get_currentstateid) + opdesc->op_get_currentstateid(cstate, &op->u); + op->status = opdesc->op_func(rqstp, cstate, &op->u); if (!op->status) { if (opdesc->op_set_currentstateid) |
