NFS: Remove the nfs4_label argument from nfs_add_or_obtain()

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>

authored by

Anna Schumaker and committed by

Trond Myklebust 4 years ago cc6f3298 d91bfc46

+5 -7

3 changed files

expand all

nfs

dir.c

nfs3proc.c

include

linux

nfs_fs.h

+3 -4

fs/nfs/dir.c

··· 2036 2036 2037 2037 struct dentry * 2038 2038 nfs_add_or_obtain(struct dentry *dentry, struct nfs_fh *fhandle, 2039 - struct nfs_fattr *fattr, 2040 - struct nfs4_label *label) 2039 + struct nfs_fattr *fattr) 2041 2040 { 2042 2041 struct dentry *parent = dget_parent(dentry); 2043 2042 struct inode *dir = d_inode(parent); ··· 2059 2060 if (error < 0) 2060 2061 goto out_error; 2061 2062 } 2062 - inode = nfs_fhget(dentry->d_sb, fhandle, fattr, label); 2063 + inode = nfs_fhget(dentry->d_sb, fhandle, fattr, fattr->label); 2063 2064 d = d_splice_alias(inode, dentry); 2064 2065 out: 2065 2066 dput(parent); ··· 2078 2079 { 2079 2080 struct dentry *d; 2080 2081 2081 - d = nfs_add_or_obtain(dentry, fhandle, fattr, fattr->label); 2082 + d = nfs_add_or_obtain(dentry, fhandle, fattr); 2082 2083 if (IS_ERR(d)) 2083 2084 return PTR_ERR(d); 2084 2085

+1 -1

fs/nfs/nfs3proc.c

··· 321 321 if (status != 0) 322 322 return ERR_PTR(status); 323 323 324 - return nfs_add_or_obtain(dentry, data->res.fh, data->res.fattr, NULL); 324 + return nfs_add_or_obtain(dentry, data->res.fh, data->res.fattr); 325 325 } 326 326 327 327 static void nfs3_free_createdata(struct nfs3_createdata *data)

+1 -2

include/linux/nfs_fs.h

··· 529 529 extern void nfs_clear_verifier_delegated(struct inode *inode); 530 530 #endif /* IS_ENABLED(CONFIG_NFS_V4) */ 531 531 extern struct dentry *nfs_add_or_obtain(struct dentry *dentry, 532 - struct nfs_fh *fh, struct nfs_fattr *fattr, 533 - struct nfs4_label *label); 532 + struct nfs_fh *fh, struct nfs_fattr *fattr); 534 533 extern int nfs_instantiate(struct dentry *dentry, struct nfs_fh *fh, 535 534 struct nfs_fattr *fattr); 536 535 extern int nfs_may_open(struct inode *inode, const struct cred *cred, int openflags);