Commit cf7ab00a authored by Anna Schumaker's avatar Anna Schumaker Committed by Trond Myklebust
Browse files

NFS: Remove the nfs4_label argument from nfs_fhget() 



Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
parent cc6f3298

fs/nfs/dir.c

+3 −3
Original line number Diff line number Diff line
@@ -697,7 +697,7 @@ void nfs_prime_dcache(struct dentry *parent, struct nfs_entry *entry, 
		goto out;

	}



	inode = nfs_fhget(dentry->d_sb, entry->fh, entry->fattr, entry->fattr->label);

	inode = nfs_fhget(dentry->d_sb, entry->fh, entry->fattr);

	alias = d_splice_alias(inode, dentry);

	d_lookup_done(dentry);

	if (alias) {
@@ -1782,7 +1782,7 @@ struct dentry *nfs_lookup(struct inode *dir, struct dentry * dentry, unsigned in 
		res = ERR_PTR(error);

		goto out;

	}

	inode = nfs_fhget(dentry->d_sb, fhandle, fattr, fattr->label);

	inode = nfs_fhget(dentry->d_sb, fhandle, fattr);

	res = ERR_CAST(inode);

	if (IS_ERR(res))

		goto out;
@@ -2059,7 +2059,7 @@ nfs_add_or_obtain(struct dentry *dentry, struct nfs_fh *fhandle, 
		if (error < 0)

			goto out_error;

	}

	inode = nfs_fhget(dentry->d_sb, fhandle, fattr, fattr->label);

	inode = nfs_fhget(dentry->d_sb, fhandle, fattr);

	d = d_splice_alias(inode, dentry);

out:

	dput(parent);

fs/nfs/export.c

+2 −2
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ nfs_fh_to_dentry(struct super_block *sb, struct fid *fid, 
		goto out_free_fattr;

	}



	inode = nfs_fhget(sb, server_fh, fattr, fattr->label);

	inode = nfs_fhget(sb, server_fh, fattr);



out_found:

	dentry = d_obtain_alias(inode);
@@ -138,7 +138,7 @@ nfs_get_parent(struct dentry *dentry) 
		goto out;

	}



	pinode = nfs_fhget(sb, &fh, fattr, fattr->label);

	pinode = nfs_fhget(sb, &fh, fattr);

	parent = d_obtain_alias(pinode);

out:

	nfs_free_fattr(fattr);

fs/nfs/getroot.c

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ int nfs_get_root(struct super_block *s, struct fs_context *fc) 
		goto out_fattr;

	}



	inode = nfs_fhget(s, ctx->mntfh, fsinfo.fattr, NULL);

	inode = nfs_fhget(s, ctx->mntfh, fsinfo.fattr);

	if (IS_ERR(inode)) {

		dprintk("nfs_get_root: get root inode failed\n");

		error = PTR_ERR(inode);

fs/nfs/inode.c

+2 −2
Original line number Diff line number Diff line
@@ -448,7 +448,7 @@ static void nfs_inode_init_dir(struct nfs_inode *nfsi) 
 * instead of inode number.

 */

struct inode *

nfs_fhget(struct super_block *sb, struct nfs_fh *fh, struct nfs_fattr *fattr, struct nfs4_label *label)

nfs_fhget(struct super_block *sb, struct nfs_fh *fh, struct nfs_fattr *fattr)

{

	struct nfs_find_desc desc = {

		.fh	= fh,
@@ -581,7 +581,7 @@ nfs_fhget(struct super_block *sb, struct nfs_fh *fh, struct nfs_fattr *fattr, st 
			   fattr->size != 0)

			nfs_set_cache_invalid(inode, NFS_INO_INVALID_BLOCKS);



		nfs_setsecurity(inode, fattr, label);

		nfs_setsecurity(inode, fattr, fattr->label);



		nfsi->attrtimeo = NFS_MINATTRTIMEO(inode);

		nfsi->attrtimeo_timestamp = now;

fs/nfs/nfs4file.c

+1 −2
Original line number Diff line number Diff line
@@ -344,8 +344,7 @@ static struct file *__nfs42_ssc_open(struct vfsmount *ss_mnt, 
		goto out;

	snprintf(read_name, len, SSC_READ_NAME_BODY, read_name_gen++);



	r_ino = nfs_fhget(ss_mnt->mnt_root->d_inode->i_sb, src_fh, fattr,

			NULL);

	r_ino = nfs_fhget(ss_mnt->mnt_root->d_inode->i_sb, src_fh, fattr);

	if (IS_ERR(r_ino)) {

		res = ERR_CAST(r_ino);

		goto out_free_name;