Messages in this thread Patch in this message | | | From | David Howells <> | Subject | [PATCH 22/52] CRED: Pass credentials to nfs_setattr_update_inode() | Date | Fri, 12 Oct 2007 17:07:11 +0100 |
| |
Pass credentials to nfs_setattr_update_inode().
Signed-off-by: David Howells <dhowells@redhat.com> ---
fs/nfs/inode.c | 6 +++--- fs/nfs/nfs3proc.c | 2 +- fs/nfs/nfs4proc.c | 4 ++-- fs/nfs/proc.c | 2 +- include/linux/nfs_fs.h | 3 ++- 5 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c index 8b21608..f76a93c 100644 --- a/fs/nfs/inode.c +++ b/fs/nfs/inode.c @@ -362,14 +362,14 @@ nfs_setattr(struct dentry *dentry, struct iattr *attr) * nfs_setattr_update_inode - Update inode metadata after a setattr call. * @inode: pointer to struct inode * @attr: pointer to struct iattr + * @acred: the credentials to use * * Note: we do this in the *proc.c in order to ensure that * it works for things like exclusive creates too. */ -void nfs_setattr_update_inode(struct inode *inode, struct iattr *attr) +void nfs_setattr_update_inode(struct inode *inode, struct iattr *attr, + struct cred *acred) { - struct cred *acred = current->cred; - if ((attr->ia_valid & (ATTR_MODE|ATTR_UID|ATTR_GID)) != 0) { if ((attr->ia_valid & ATTR_MODE) != 0) { int mode = attr->ia_mode & S_IALLUGO; diff --git a/fs/nfs/nfs3proc.c b/fs/nfs/nfs3proc.c index 4d66cfd..627188e 100644 --- a/fs/nfs/nfs3proc.c +++ b/fs/nfs/nfs3proc.c @@ -138,7 +138,7 @@ nfs3_proc_setattr(struct dentry *dentry, struct nfs_fattr *fattr, nfs_fattr_init(fattr); status = rpc_call_sync(NFS_CLIENT(inode), &msg, 0, acred); if (status == 0) - nfs_setattr_update_inode(inode, sattr); + nfs_setattr_update_inode(inode, sattr, acred); dprintk("NFS reply setattr: %d\n", status); return status; } diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 83c9b66..c10f3de 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -1725,7 +1725,7 @@ nfs4_proc_setattr(struct dentry *dentry, struct nfs_fattr *fattr, status = nfs4_do_setattr(inode, fattr, sattr, state, acred); if (status == 0) - nfs_setattr_update_inode(inode, sattr); + nfs_setattr_update_inode(inode, sattr, acred); if (ctx != NULL) put_nfs_open_context(ctx); put_rpccred(cred); @@ -1967,7 +1967,7 @@ nfs4_proc_create(struct inode *dir, struct dentry *dentry, struct iattr *sattr, status = nfs4_do_setattr(state->inode, &fattr, sattr, state, acred); if (status == 0) - nfs_setattr_update_inode(state->inode, sattr); + nfs_setattr_update_inode(state->inode, sattr, acred); nfs_post_op_update_inode(state->inode, &fattr); } if (status == 0 && (nd->flags & LOOKUP_OPEN) != 0) diff --git a/fs/nfs/proc.c b/fs/nfs/proc.c index aeb7e38..993d289 100644 --- a/fs/nfs/proc.c +++ b/fs/nfs/proc.c @@ -134,7 +134,7 @@ nfs_proc_setattr(struct dentry *dentry, struct nfs_fattr *fattr, nfs_fattr_init(fattr); status = rpc_call_sync(NFS_CLIENT(inode), &msg, 0, acred); if (status == 0) - nfs_setattr_update_inode(inode, sattr); + nfs_setattr_update_inode(inode, sattr, acred); dprintk("NFS reply setattr: %d\n", status); return status; } diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h index f7ab86c..fe3136e 100644 --- a/include/linux/nfs_fs.h +++ b/include/linux/nfs_fs.h @@ -307,7 +307,8 @@ extern int nfs_revalidate_mapping_nolock(struct inode *inode, struct address_space *mapping, struct cred *acred); extern int nfs_setattr(struct dentry *, struct iattr *); -extern void nfs_setattr_update_inode(struct inode *inode, struct iattr *attr); +extern void nfs_setattr_update_inode(struct inode *inode, struct iattr *attr, + struct cred *acred); extern void nfs_begin_attr_update(struct inode *); extern void nfs_end_attr_update(struct inode *); extern void nfs_begin_data_update(struct inode *); - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |