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

NFS: Remove the nfs4_label from the nfs4_getattr_res 



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

fs/nfs/client.c

+1 −1
Original line number Diff line number Diff line
@@ -1048,7 +1048,7 @@ struct nfs_server *nfs_create_server(struct fs_context *fc) 


	if (!(fattr->valid & NFS_ATTR_FATTR)) {

		error = ctx->nfs_mod->rpc_ops->getattr(server, ctx->mntfh,

						       fattr, NULL, NULL);

						       fattr, NULL);

		if (error < 0) {

			dprintk("nfs_create_server: getattr error = %d\n", -error);

			goto error;

fs/nfs/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -2056,7 +2056,7 @@ nfs_add_or_obtain(struct dentry *dentry, struct nfs_fh *fhandle, 
	if (!(fattr->valid & NFS_ATTR_FATTR)) {

		struct nfs_server *server = NFS_SB(dentry->d_sb);

		error = server->nfs_client->rpc_ops->getattr(server, fhandle,

				fattr, NULL, NULL);

				fattr, NULL);

		if (error < 0)

			goto out_error;

	}

fs/nfs/export.c

+4 −14
Original line number Diff line number Diff line
@@ -64,7 +64,6 @@ static struct dentry * 
nfs_fh_to_dentry(struct super_block *sb, struct fid *fid,

		 int fh_len, int fh_type)

{

	struct nfs4_label *label = NULL;

	struct nfs_fattr *fattr = NULL;

	struct nfs_fh *server_fh = nfs_exp_embedfh(fid->raw);

	size_t fh_size = offsetof(struct nfs_fh, data) + server_fh->size;
@@ -79,7 +78,7 @@ nfs_fh_to_dentry(struct super_block *sb, struct fid *fid, 
	if (fh_len < len || fh_type != len)

		return NULL;



	fattr = nfs_alloc_fattr();

	fattr = nfs_alloc_fattr_with_label(NFS_SB(sb));

	if (fattr == NULL) {

		dentry = ERR_PTR(-ENOMEM);

		goto out;
@@ -95,28 +94,19 @@ nfs_fh_to_dentry(struct super_block *sb, struct fid *fid, 
	if (inode)

		goto out_found;



	label = nfs4_label_alloc(NFS_SB(sb), GFP_KERNEL);

	if (IS_ERR(label)) {

		dentry = ERR_CAST(label);

		goto out_free_fattr;

	}



	rpc_ops = NFS_SB(sb)->nfs_client->rpc_ops;

	ret = rpc_ops->getattr(NFS_SB(sb), server_fh, fattr, label, NULL);

	ret = rpc_ops->getattr(NFS_SB(sb), server_fh, fattr, NULL);

	if (ret) {

		dprintk("%s: getattr failed %d\n", __func__, ret);

		trace_nfs_fh_to_dentry(sb, server_fh, fattr->fileid, ret);

		dentry = ERR_PTR(ret);

		goto out_free_label;

		goto out_free_fattr;

	}



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

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



out_found:

	dentry = d_obtain_alias(inode);



out_free_label:

	nfs4_label_free(label);

out_free_fattr:

	nfs_free_fattr(fattr);

out:

fs/nfs/inode.c

+5 −15
Original line number Diff line number Diff line
@@ -1194,7 +1194,6 @@ int 
__nfs_revalidate_inode(struct nfs_server *server, struct inode *inode)

{

	int		 status = -ESTALE;

	struct nfs4_label *label = NULL;

	struct nfs_fattr *fattr = NULL;

	struct nfs_inode *nfsi = NFS_I(inode);
@@ -1216,20 +1215,13 @@ __nfs_revalidate_inode(struct nfs_server *server, struct inode *inode) 
	}



	status = -ENOMEM;

	fattr = nfs_alloc_fattr();

	fattr = nfs_alloc_fattr_with_label(NFS_SERVER(inode));

	if (fattr == NULL)

		goto out;



	nfs_inc_stats(inode, NFSIOS_INODEREVALIDATE);



	label = nfs4_label_alloc(NFS_SERVER(inode), GFP_KERNEL);

	if (IS_ERR(label)) {

		status = PTR_ERR(label);

		goto out;

	}



	status = NFS_PROTO(inode)->getattr(server, NFS_FH(inode), fattr,

			label, inode);

	status = NFS_PROTO(inode)->getattr(server, NFS_FH(inode), fattr, inode);

	if (status != 0) {

		dfprintk(PAGECACHE, "nfs_revalidate_inode: (%s/%Lu) getattr failed, error=%d\n",

			 inode->i_sb->s_id,
@@ -1246,7 +1238,7 @@ __nfs_revalidate_inode(struct nfs_server *server, struct inode *inode) 
			else

				nfs_zap_caches(inode);

		}

		goto err_out;

		goto out;

	}



	status = nfs_refresh_inode(inode, fattr);
@@ -1254,20 +1246,18 @@ __nfs_revalidate_inode(struct nfs_server *server, struct inode *inode) 
		dfprintk(PAGECACHE, "nfs_revalidate_inode: (%s/%Lu) refresh failed, error=%d\n",

			 inode->i_sb->s_id,

			 (unsigned long long)NFS_FILEID(inode), status);

		goto err_out;

		goto out;

	}



	if (nfsi->cache_validity & NFS_INO_INVALID_ACL)

		nfs_zap_acl_cache(inode);



	nfs_setsecurity(inode, fattr, label);

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



	dfprintk(PAGECACHE, "NFS: (%s/%Lu) revalidation complete\n",

		inode->i_sb->s_id,

		(unsigned long long)NFS_FILEID(inode));



err_out:

	nfs4_label_free(label);

out:

	nfs_free_fattr(fattr);

	trace_nfs_revalidate_inode_exit(inode, status);

fs/nfs/nfs3proc.c

+1 −2
Original line number Diff line number Diff line
@@ -100,8 +100,7 @@ nfs3_proc_get_root(struct nfs_server *server, struct nfs_fh *fhandle, 
 */

static int

nfs3_proc_getattr(struct nfs_server *server, struct nfs_fh *fhandle,

		struct nfs_fattr *fattr, struct nfs4_label *label,

		struct inode *inode)

		struct nfs_fattr *fattr, struct inode *inode)

{

	struct rpc_message msg = {

		.rpc_proc	= &nfs3_procedures[NFS3PROC_GETATTR],