| Message ID | 1419012641-8564-1-git-send-email-trond.myklebust@primarydata.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Dec 19, 2014 at 1:10 PM, Trond Myklebust <trond.myklebust@primarydata.com> wrote: > Ensure that we deal correctly with the case where the server sends us a > newer instance of the same delegation. If the stateids match, but the > sequence numbers differ, then treat the new delegation as if it were > an atomic upgrade. > > Signed-off-by: Trond Myklebust <Trond.Myklebust@primarydata.com> > --- > fs/nfs/delegation.c | 20 +++++++++++++++++--- > 1 file changed, 17 insertions(+), 3 deletions(-) > > diff --git a/fs/nfs/delegation.c b/fs/nfs/delegation.c > index 7f3f60641344..90413cdbf254 100644 > --- a/fs/nfs/delegation.c > +++ b/fs/nfs/delegation.c > @@ -301,6 +301,18 @@ nfs_inode_detach_delegation(struct inode *inode) > return nfs_detach_delegation(nfsi, delegation, server); > } > > +static void > +nfs_update_inplace_delegation(struct nfs_delegation *delegation, > + struct nfs_delegation *update) > +{ > + if (nfs4_stateid_is_newer(&update->stateid, &delegation->stateid)) > + return; > + delegation->stateid.seqid = update->stateid.seqid; > + smp_wmb(); > + delegation->type == update->type; > + nfsi->delegation_state = update->type; Oops... That wasn't intended. I'll resend an update that actually compiles... > +} > + > /** > * nfs_inode_set_delegation - set up a delegation on an inode > * @inode: inode to which delegation applies > @@ -334,9 +346,11 @@ int nfs_inode_set_delegation(struct inode *inode, struct rpc_cred *cred, struct > old_delegation = rcu_dereference_protected(nfsi->delegation, > lockdep_is_held(&clp->cl_lock)); > if (old_delegation != NULL) { > - if (nfs4_stateid_match(&delegation->stateid, > - &old_delegation->stateid) && > - delegation->type == old_delegation->type) { > + /* Is this an update of the existing delegation? */ > + if (nfs4_stateid_match_other(&old_delegation->stateid, > + &delegation->stateid)) { > + nfs_update_inplace_delegation(old_delegation, > + delegation); > goto out; > } > /* > -- > 2.1.0 >
diff --git a/fs/nfs/delegation.c b/fs/nfs/delegation.c index 7f3f60641344..90413cdbf254 100644 --- a/fs/nfs/delegation.c +++ b/fs/nfs/delegation.c @@ -301,6 +301,18 @@ nfs_inode_detach_delegation(struct inode *inode) return nfs_detach_delegation(nfsi, delegation, server); } +static void +nfs_update_inplace_delegation(struct nfs_delegation *delegation, + struct nfs_delegation *update) +{ + if (nfs4_stateid_is_newer(&update->stateid, &delegation->stateid)) + return; + delegation->stateid.seqid = update->stateid.seqid; + smp_wmb(); + delegation->type == update->type; + nfsi->delegation_state = update->type; +} + /** * nfs_inode_set_delegation - set up a delegation on an inode * @inode: inode to which delegation applies @@ -334,9 +346,11 @@ int nfs_inode_set_delegation(struct inode *inode, struct rpc_cred *cred, struct old_delegation = rcu_dereference_protected(nfsi->delegation, lockdep_is_held(&clp->cl_lock)); if (old_delegation != NULL) { - if (nfs4_stateid_match(&delegation->stateid, - &old_delegation->stateid) && - delegation->type == old_delegation->type) { + /* Is this an update of the existing delegation? */ + if (nfs4_stateid_match_other(&old_delegation->stateid, + &delegation->stateid)) { + nfs_update_inplace_delegation(old_delegation, + delegation); goto out; } /*
Ensure that we deal correctly with the case where the server sends us a newer instance of the same delegation. If the stateids match, but the sequence numbers differ, then treat the new delegation as if it were an atomic upgrade. Signed-off-by: Trond Myklebust <Trond.Myklebust@primarydata.com> --- fs/nfs/delegation.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-)