nfsd: Remove nfs4_set_claim_prev()
authorKinglong Mee <kinglongmee@gmail.com>
Mon, 13 Jul 2015 09:32:59 +0000 (17:32 +0800)
committerJ. Bruce Fields <bfields@redhat.com>
Mon, 10 Aug 2015 20:05:50 +0000 (16:05 -0400)
Signed-off-by: Kinglong Mee <kinglongmee@gmail.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
fs/nfsd/nfs4state.c

index 30dbc9c0975aab3f6e027eaa7c6258facb802137..a44be220eca11e4b36aac7aae997d7ab2c6f342b 100644 (file)
@@ -3893,12 +3893,6 @@ nfs4_upgrade_open(struct svc_rqst *rqstp, struct nfs4_file *fp, struct svc_fh *c
        return status;
 }
 
-static void
-nfs4_set_claim_prev(struct nfsd4_open *open, bool has_session)
-{
-       open->op_openowner->oo_flags |= NFS4_OO_CONFIRMED;
-}
-
 /* Should we give out recallable state?: */
 static bool nfsd4_cb_channel_good(struct nfs4_client *clp)
 {
@@ -4218,7 +4212,7 @@ out:
        if (fp)
                put_nfs4_file(fp);
        if (status == 0 && open->op_claim_type == NFS4_OPEN_CLAIM_PREVIOUS)
-               nfs4_set_claim_prev(open, nfsd4_has_session(&resp->cstate));
+               open->op_openowner->oo_flags |= NFS4_OO_CONFIRMED;
        /*
        * To finish the open response, we just need to set the rflags.
        */