Merge branch 'pm-devfreq'

[mirror_ubuntu-zesty-kernel.git] / fs / nfsd / nfs4state.c

diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 6b800b5b8fedb5d60c8bf1a8d1ca6d35f3d54114..df5dba6872655e699ec950ad2e0604adbab70bd6 100644 (file)
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -4797,10 +4797,9 @@ nfs4_check_file(struct svc_rqst *rqstp, struct svc_fh *fhp, struct nfs4_stid *s,
  */
 __be32
 nfs4_preprocess_stateid_op(struct svc_rqst *rqstp,
-               struct nfsd4_compound_state *cstate, stateid_t *stateid,
-               int flags, struct file **filpp, bool *tmp_file)
+               struct nfsd4_compound_state *cstate, struct svc_fh *fhp,
+               stateid_t *stateid, int flags, struct file **filpp, bool *tmp_file)
 {
-       struct svc_fh *fhp = &cstate->current_fh;
        struct inode *ino = d_inode(fhp->fh_dentry);
        struct net *net = SVC_NET(rqstp);
        struct nfsd_net *nn = net_generic(net, nfsd_net_id);