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

NFS: Remove the nfs4_label from the nfs_entry struct 



And instead allocate the fattr using nfs_alloc_fattr_with_label()

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

fs/nfs/dir.c

+7 −14
Original line number Diff line number Diff line
@@ -682,7 +682,8 @@ void nfs_prime_dcache(struct dentry *parent, struct nfs_entry *entry, 
			nfs_set_verifier(dentry, dir_verifier);

			status = nfs_refresh_inode(d_inode(dentry), entry->fattr);

			if (!status)

				nfs_setsecurity(d_inode(dentry), entry->fattr, entry->label);

				nfs_setsecurity(d_inode(dentry), entry->fattr,

						entry->fattr->label);

			goto out;

		} else {

			d_invalidate(dentry);
@@ -696,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->label);

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

	alias = d_splice_alias(inode, dentry);

	d_lookup_done(dentry);

	if (alias) {
@@ -732,8 +733,8 @@ static int nfs_readdir_page_filler(struct nfs_readdir_descriptor *desc, 
	xdr_set_scratch_page(&stream, scratch);



	do {

		if (entry->label)

			entry->label->len = NFS4_MAXLABELLEN;

		if (entry->fattr->label)

			entry->fattr->label->len = NFS4_MAXLABELLEN;



		status = xdr_decode(desc, entry, &stream);

		if (status != 0)
@@ -838,21 +839,15 @@ static int nfs_readdir_xdr_to_array(struct nfs_readdir_descriptor *desc, 
		return -ENOMEM;

	entry->cookie = nfs_readdir_page_last_cookie(page);

	entry->fh = nfs_alloc_fhandle();

	entry->fattr = nfs_alloc_fattr();

	entry->fattr = nfs_alloc_fattr_with_label(NFS_SERVER(inode));

	entry->server = NFS_SERVER(inode);

	if (entry->fh == NULL || entry->fattr == NULL)

		goto out;



	entry->label = nfs4_label_alloc(NFS_SERVER(inode), GFP_NOWAIT);

	if (IS_ERR(entry->label)) {

		status = PTR_ERR(entry->label);

		goto out;

	}



	array_size = (dtsize + PAGE_SIZE - 1) >> PAGE_SHIFT;

	pages = nfs_readdir_alloc_pages(array_size);

	if (!pages)

		goto out_release_label;

		goto out;



	do {

		unsigned int pglen;
@@ -875,8 +870,6 @@ static int nfs_readdir_xdr_to_array(struct nfs_readdir_descriptor *desc, 
	} while (!status && nfs_readdir_page_needs_filling(page));



	nfs_readdir_free_pages(pages, array_size);

out_release_label:

	nfs4_label_free(entry->label);

out:

	nfs_free_fattr(entry->fattr);

	nfs_free_fhandle(entry->fh);

fs/nfs/nfs4xdr.c

+1 −1
Original line number Diff line number Diff line
@@ -7467,7 +7467,7 @@ int nfs4_decode_dirent(struct xdr_stream *xdr, struct nfs_entry *entry, 
		return -EAGAIN;



	if (decode_getfattr_attrs(xdr, bitmap, entry->fattr, entry->fh,

			NULL, entry->label, entry->server) < 0)

			NULL, entry->fattr->label, entry->server) < 0)

		return -EAGAIN;

	if (entry->fattr->valid & NFS_ATTR_FATTR_MOUNTED_ON_FILEID)

		entry->ino = entry->fattr->mounted_on_fileid;

include/linux/nfs_xdr.h

+0 −1
Original line number Diff line number Diff line
@@ -753,7 +753,6 @@ struct nfs_entry { 
	int			eof;

	struct nfs_fh *		fh;

	struct nfs_fattr *	fattr;

	struct nfs4_label  *label;

	unsigned char		d_type;

	struct nfs_server *	server;

};