aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfsd
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@redhat.com>2013-02-28 14:55:46 -0500
committerJ. Bruce Fields <bfields@redhat.com>2013-04-03 11:47:45 -0400
commitb600de7ab9288eaf6126561203e0ae340828ab44 (patch)
treed084252ad8be7140637ed13579ef97a9ca7e9482 /fs/nfsd
parent0733c7ba1ef0d7e29a11c52f4d1356fc394de334 (diff)
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>
Diffstat (limited to 'fs/nfsd')
-rw-r--r--fs/nfsd/nfs4proc.c9
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,
1282 if (op->status) 1282 if (op->status)
1283 goto encode_op; 1283 goto encode_op;
1284 1284
1285 if (opdesc->op_func) { 1285 if (opdesc->op_get_currentstateid)
1286 if (opdesc->op_get_currentstateid) 1286 opdesc->op_get_currentstateid(cstate, &op->u);
1287 opdesc->op_get_currentstateid(cstate, &op->u); 1287 op->status = opdesc->op_func(rqstp, cstate, &op->u);
1288 op->status = opdesc->op_func(rqstp, cstate, &op->u);
1289 } else
1290 BUG_ON(op->status == nfs_ok);
1291 1288
1292 if (!op->status) { 1289 if (!op->status) {
1293 if (opdesc->op_set_currentstateid) 1290 if (opdesc->op_set_currentstateid)