From: Olga Kornievskaia <olga.kornievskaia@gmail.com> To: bfields@redhat.com Cc: linux-nfs@vger.kernel.org Subject: [PATCH v5 6/9] NFSD check stateids against copy stateids Date: Thu, 8 Aug 2019 16:18:45 -0400 [thread overview] Message-ID: <20190808201848.36640-7-olga.kornievskaia@gmail.com> (raw) In-Reply-To: <20190808201848.36640-1-olga.kornievskaia@gmail.com> Incoming stateid (used by a READ) could be a saved copy stateid. Update the copy notify timestamp (cpntf_time) with current time. Signed-off-by: Olga Kornievskaia <kolga@netapp.com> --- fs/nfsd/nfs4state.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index bd962f1..31a32ec 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -5672,6 +5672,43 @@ void free_cpntf_state(struct nfsd_net *nn, struct nfs4_cpntf_state *cps) nfs4_put_stid(cps->cp_p_stid); kfree(cps); } +/* + * A READ from an inter server to server COPY will have a + * copy stateid. Return the parent nfs4_stid. + */ +static __be32 _find_cpntf_state(struct nfsd_net *nn, stateid_t *st, + struct nfs4_cpntf_state **cps) +{ + struct nfs4_cpntf_state *state = NULL; + + if (st->si_opaque.so_clid.cl_id != nn->s2s_cp_cl_id) + return nfserr_bad_stateid; + spin_lock(&nn->s2s_cp_lock); + state = idr_find(&nn->s2s_cp_stateids, st->si_opaque.so_id); + if (state) + refcount_inc(&state->cp_p_stid->sc_count); + spin_unlock(&nn->s2s_cp_lock); + if (!state) + return nfserr_bad_stateid; + *cps = state; + return 0; +} + +static __be32 find_cpntf_state(struct nfsd_net *nn, stateid_t *st, + struct nfs4_stid **stid) +{ + __be32 status; + struct nfs4_cpntf_state *cps = NULL; + + status = _find_cpntf_state(nn, st, &cps); + if (status) + return status; + + cps->cpntf_time = get_seconds(); + *stid = cps->cp_p_stid; + + return nfs_ok; +} /* * Checks for stateid operations @@ -5704,6 +5741,8 @@ void free_cpntf_state(struct nfsd_net *nn, struct nfs4_cpntf_state *cps) status = nfsd4_lookup_stateid(cstate, stateid, NFS4_DELEG_STID|NFS4_OPEN_STID|NFS4_LOCK_STID, &s, nn); + if (status == nfserr_bad_stateid) + status = find_cpntf_state(nn, stateid, &s); if (status) return status; status = nfsd4_stid_check_stateid_generation(stateid, s, -- 1.8.3.1
next prev parent reply other threads:[~2019-08-08 20:18 UTC|newest] Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-08-08 20:18 [PATCH v5 0/9] server-side support for "inter" SSC copy Olga Kornievskaia 2019-08-08 20:18 ` [PATCH v5 1/9] NFSD fill-in netloc4 structure Olga Kornievskaia 2019-08-11 5:48 ` kbuild test robot 2019-08-12 16:12 ` Olga Kornievskaia 2019-08-12 19:58 ` J. Bruce Fields 2019-08-08 20:18 ` [PATCH v5 2/9] NFSD add ca_source_server<> to COPY Olga Kornievskaia 2019-08-11 5:59 ` kbuild test robot 2019-08-11 7:00 ` kbuild test robot 2019-08-08 20:18 ` [PATCH v5 3/9] NFSD return nfs4_stid in nfs4_preprocess_stateid_op Olga Kornievskaia 2019-08-08 20:18 ` [PATCH v5 4/9] NFSD COPY_NOTIFY xdr Olga Kornievskaia 2019-08-11 6:10 ` kbuild test robot 2019-08-08 20:18 ` [PATCH v5 5/9] NFSD add COPY_NOTIFY operation Olga Kornievskaia 2019-08-11 6:17 ` kbuild test robot 2019-08-12 16:19 ` Olga Kornievskaia 2019-08-12 19:16 ` Olga Kornievskaia 2019-08-12 20:00 ` J. Bruce Fields 2019-08-12 20:00 ` J. Bruce Fields 2019-08-13 17:57 ` Olga Kornievskaia 2019-08-14 15:05 ` Olga Kornievskaia 2019-08-29 19:23 ` Olga Kornievskaia 2019-08-30 17:56 ` J. Bruce Fields 2019-08-08 20:18 ` Olga Kornievskaia [this message] 2019-08-08 20:18 ` [PATCH v5 7/9] NFSD generalize nfsd4_compound_state flag names Olga Kornievskaia 2019-08-08 20:18 ` [PATCH v5 8/9] NFSD: allow inter server COPY to have a STALE source server fh Olga Kornievskaia 2019-08-08 20:18 ` [PATCH v5 9/9] NFSD add nfs4 inter ssc to nfsd4_copy Olga Kornievskaia 2019-08-11 6:24 ` kbuild test robot 2019-09-04 20:50 ` [PATCH v5 0/9] server-side support for "inter" SSC copy J. Bruce Fields 2019-09-05 0:05 ` Olga Kornievskaia 2019-09-05 0:13 ` Rick Macklem 2019-09-06 14:23 ` Olga Kornievskaia 2019-09-06 15:32 ` Rick Macklem
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20190808201848.36640-7-olga.kornievskaia@gmail.com \ --to=olga.kornievskaia@gmail.com \ --cc=bfields@redhat.com \ --cc=linux-nfs@vger.kernel.org \ --subject='Re: [PATCH v5 6/9] NFSD check stateids against copy stateids' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).