aleph/lkl_linux
1
0
Fork 0
mirror of https://github.com/lkl/linux.git synced 2025-12-19 16:13:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

NFS: Remove the nfs4_label argument from nfs_instantiate()

Browse Source 
Pull the label from the fattr instead.

Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
This commit is contained in:
Anna Schumaker
2021-10-22 13:11:09 -04:00
committed by Trond Myklebust
parent 1b00ad6579
commit d91bfc4642
4 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
fs/nfs/dir.c
View File

@@ -2075,12 +2075,11 @@ EXPORT_SYMBOL_GPL(nfs_add_or_obtain);
* Code common to create, mkdir, and mknod. * Code common to create, mkdir, and mknod.
*/ */
int nfs_instantiate(struct dentry *dentry, struct nfs_fh *fhandle, int nfs_instantiate(struct dentry *dentry, struct nfs_fh *fhandle,
struct nfs_fattr *fattr, struct nfs_fattr *fattr)
struct nfs4_label *label)
{ {
struct dentry *d; struct dentry *d;
d = nfs_add_or_obtain(dentry, fhandle, fattr, label); d = nfs_add_or_obtain(dentry, fhandle, fattr, fattr->label);
if (IS_ERR(d)) if (IS_ERR(d))
return PTR_ERR(d); return PTR_ERR(d);

2
fs/nfs/nfs4proc.c
View File

@@ -4859,7 +4859,7 @@ static int nfs4_do_create(struct inode *dir, struct dentry *dentry, struct nfs4_
data->res.fattr->time_start, data->res.fattr->time_start,
NFS_INO_INVALID_DATA); NFS_INO_INVALID_DATA);
spin_unlock(&dir->i_lock); spin_unlock(&dir->i_lock);
status = nfs_instantiate(dentry, data->res.fh, data->res.fattr, data->res.fattr->label); status = nfs_instantiate(dentry, data->res.fh, data->res.fattr);
} }
return status; return status;
} }

8
fs/nfs/proc.c
View File

@@ -255,7 +255,7 @@ nfs_proc_create(struct inode *dir, struct dentry *dentry, struct iattr *sattr,
status = rpc_call_sync(NFS_CLIENT(dir), &msg, 0); status = rpc_call_sync(NFS_CLIENT(dir), &msg, 0);
nfs_mark_for_revalidate(dir); nfs_mark_for_revalidate(dir);
if (status == 0) if (status == 0)
status = nfs_instantiate(dentry, data->res.fh, data->res.fattr, NULL); status = nfs_instantiate(dentry, data->res.fh, data->res.fattr);
nfs_free_createdata(data); nfs_free_createdata(data);
out: out:
dprintk("NFS reply create: %d\n", status); dprintk("NFS reply create: %d\n", status);
@@ -302,7 +302,7 @@ nfs_proc_mknod(struct inode *dir, struct dentry *dentry, struct iattr *sattr,
status = rpc_call_sync(NFS_CLIENT(dir), &msg, 0); status = rpc_call_sync(NFS_CLIENT(dir), &msg, 0);
} }
if (status == 0) if (status == 0)
status = nfs_instantiate(dentry, data->res.fh, data->res.fattr, NULL); status = nfs_instantiate(dentry, data->res.fh, data->res.fattr);
nfs_free_createdata(data); nfs_free_createdata(data);
out: out:
dprintk("NFS reply mknod: %d\n", status); dprintk("NFS reply mknod: %d\n", status);
@@ -434,7 +434,7 @@ nfs_proc_symlink(struct inode *dir, struct dentry *dentry, struct page *page,
* should fill in the data with a LOOKUP call on the wire. * should fill in the data with a LOOKUP call on the wire.
*/ */
if (status == 0) if (status == 0)
status = nfs_instantiate(dentry, fh, fattr, NULL); status = nfs_instantiate(dentry, fh, fattr);
out_free: out_free:
nfs_free_fattr(fattr); nfs_free_fattr(fattr);
@@ -463,7 +463,7 @@ nfs_proc_mkdir(struct inode *dir, struct dentry *dentry, struct iattr *sattr)
status = rpc_call_sync(NFS_CLIENT(dir), &msg, 0); status = rpc_call_sync(NFS_CLIENT(dir), &msg, 0);
nfs_mark_for_revalidate(dir); nfs_mark_for_revalidate(dir);
if (status == 0) if (status == 0)
status = nfs_instantiate(dentry, data->res.fh, data->res.fattr, NULL); status = nfs_instantiate(dentry, data->res.fh, data->res.fattr);
nfs_free_createdata(data); nfs_free_createdata(data);
out: out:
dprintk("NFS reply mkdir: %d\n", status); dprintk("NFS reply mkdir: %d\n", status);

2
include/linux/nfs_fs.h
View File

@@ -532,7 +532,7 @@ extern struct dentry *nfs_add_or_obtain(struct dentry *dentry,
struct nfs_fh *fh, struct nfs_fattr *fattr, struct nfs_fh *fh, struct nfs_fattr *fattr,
struct nfs4_label *label); struct nfs4_label *label);
extern int nfs_instantiate(struct dentry *dentry, struct nfs_fh *fh, extern int nfs_instantiate(struct dentry *dentry, struct nfs_fh *fh,
struct nfs_fattr *fattr, struct nfs4_label *label); struct nfs_fattr *fattr);
extern int nfs_may_open(struct inode *inode, const struct cred *cred, int openflags); extern int nfs_may_open(struct inode *inode, const struct cred *cred, int openflags);
extern void nfs_access_zap_cache(struct inode *inode); extern void nfs_access_zap_cache(struct inode *inode);
extern int nfs_access_get_cached(struct inode *inode, const struct cred *cred, struct nfs_access_entry *res, extern int nfs_access_get_cached(struct inode *inode, const struct cred *cred, struct nfs_access_entry *res,