nfsd4: remove BUG_ON

[linux-imx.git] / fs / nfsd / nfs4proc.c

diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
index 9d1c5dba2bbb6625df90cebca48a364a29b9fe97..c7e4e8c2882797172f373c5a0bce434d9e9293a9 100644 (file)
--- a/fs/nfsd/nfs4proc.c
+++ b/fs/nfsd/nfs4proc.c
@@ -993,14 +993,15 @@ _nfsd4_verify(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
        if (!buf)
                return nfserr_jukebox;
 
+       p = buf;
        status = nfsd4_encode_fattr(&cstate->current_fh,
                                    cstate->current_fh.fh_export,
-                                   cstate->current_fh.fh_dentry, buf,
-                                   &count, verify->ve_bmval,
+                                   cstate->current_fh.fh_dentry, &p,
+                                   count, verify->ve_bmval,
                                    rqstp, 0);
 
        /* this means that nfsd4_encode_fattr() ran out of space */
-       if (status == nfserr_resource && count == 0)
+       if (status == nfserr_resource)
                status = nfserr_not_same;
        if (status)
                goto out_kfree;
@@ -1281,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)