]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
nfsd4: remove BUG_ON
authorJ. Bruce Fields <bfields@redhat.com>
Thu, 28 Feb 2013 19:55:46 +0000 (11:55 -0800)
committerJ. Bruce Fields <bfields@redhat.com>
Wed, 3 Apr 2013 15:47:45 +0000 (11:47 -0400)
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>
fs/nfsd/nfs4proc.c

index ae73175e6e6854fda740bd5a0dd88d17f14d556f..c7e4e8c2882797172f373c5a0bce434d9e9293a9 100644 (file)
@@ -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)