Commit 57f188e0 authored by Trond Myklebust's avatar Trond Myklebust

NFSv4: nfs_update_inplace_delegation() should update delegation cred

If the cred assigned to the delegation that we're updating differs
from the one we're updating too, then we need to update that field
too.
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
parent 59e356a9
...@@ -377,6 +377,18 @@ nfs_inode_detach_delegation(struct inode *inode) ...@@ -377,6 +377,18 @@ nfs_inode_detach_delegation(struct inode *inode)
return delegation; return delegation;
} }
static void
nfs_update_delegation_cred(struct nfs_delegation *delegation,
const struct cred *cred)
{
const struct cred *old;
if (cred_fscmp(delegation->cred, cred) != 0) {
old = xchg(&delegation->cred, get_cred(cred));
put_cred(old);
}
}
static void static void
nfs_update_inplace_delegation(struct nfs_delegation *delegation, nfs_update_inplace_delegation(struct nfs_delegation *delegation,
const struct nfs_delegation *update) const struct nfs_delegation *update)
...@@ -385,9 +397,15 @@ nfs_update_inplace_delegation(struct nfs_delegation *delegation, ...@@ -385,9 +397,15 @@ nfs_update_inplace_delegation(struct nfs_delegation *delegation,
delegation->stateid.seqid = update->stateid.seqid; delegation->stateid.seqid = update->stateid.seqid;
smp_wmb(); smp_wmb();
delegation->type = update->type; delegation->type = update->type;
if (test_and_clear_bit(NFS_DELEGATION_REVOKED, &delegation->flags)) delegation->pagemod_limit = update->pagemod_limit;
if (test_bit(NFS_DELEGATION_REVOKED, &delegation->flags)) {
delegation->change_attr = update->change_attr;
nfs_update_delegation_cred(delegation, update->cred);
/* smp_mb__before_atomic() is implicit due to xchg() */
clear_bit(NFS_DELEGATION_REVOKED, &delegation->flags);
atomic_long_inc(&nfs_active_delegations); atomic_long_inc(&nfs_active_delegations);
} }
}
} }
/** /**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment