From 3a173055908fb2839ef3de69cf0631ce3d79794a Mon Sep 17 00:00:00 2001 From: "J. Bruce Fields" Date: Thu, 28 Feb 2013 11:55:46 -0800 Subject: [PATCH] --- yaml --- r: 372164 b: refs/heads/master c: b600de7ab9288eaf6126561203e0ae340828ab44 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/nfsd/nfs4proc.c | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 49c6407b76ba..a11e66fe4237 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0733c7ba1ef0d7e29a11c52f4d1356fc394de334 +refs/heads/master: b600de7ab9288eaf6126561203e0ae340828ab44 diff --git a/trunk/fs/nfsd/nfs4proc.c b/trunk/fs/nfsd/nfs4proc.c index ae73175e6e68..c7e4e8c28827 100644 --- a/trunk/fs/nfsd/nfs4proc.c +++ b/trunk/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)