Commit c228fd3a authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFSv4: Cleanups for fs_locations code. 



Start long arduous project...  What the hell is

	struct dentry = {};

all about?

Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent faebf4e2

fs/nfs/internal.h

+0 −4
Original line number Diff line number Diff line
@@ -107,10 +107,6 @@ extern __be32 *nfs4_decode_dirent(__be32 *p, struct nfs_entry *entry, int plus); 
/* nfs4proc.c */

#ifdef CONFIG_NFS_V4

extern struct rpc_procinfo nfs4_procedures[];



extern int nfs4_proc_fs_locations(struct inode *dir, struct dentry *dentry,

				  struct nfs4_fs_locations *fs_locations,

				  struct page *page);

#endif



/* dir.c */

fs/nfs/nfs4_fs.h

+1 −1
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ extern int nfs4_do_close(struct inode *inode, struct nfs4_state *state); 
extern struct dentry *nfs4_atomic_open(struct inode *, struct dentry *, struct nameidata *);

extern int nfs4_open_revalidate(struct inode *, struct dentry *, int, struct nameidata *);

extern int nfs4_server_capabilities(struct nfs_server *server, struct nfs_fh *fhandle);

extern int nfs4_proc_fs_locations(struct inode *dir, struct dentry *dentry,

extern int nfs4_proc_fs_locations(struct inode *dir, struct qstr *name,

		struct nfs4_fs_locations *fs_locations, struct page *page);



extern struct nfs4_state_recovery_ops nfs4_reboot_recovery_ops;

fs/nfs/nfs4namespace.c

+2 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <linux/vfs.h>

#include <linux/inet.h>

#include "internal.h"

#include "nfs4_fs.h"



#define NFSDBG_FACILITY		NFSDBG_VFS
@@ -242,7 +243,7 @@ struct vfsmount *nfs_do_refmount(const struct vfsmount *mnt_parent, struct dentr 
	dprintk("%s: getting locations for %s/%s\n",

		__FUNCTION__, parent->d_name.name, dentry->d_name.name);



	err = nfs4_proc_fs_locations(parent->d_inode, dentry, fs_locations, page);

	err = nfs4_proc_fs_locations(parent->d_inode, &dentry->d_name, fs_locations, page);

	dput(parent);

	if (err != 0 ||

	    fs_locations->nlocations <= 0 ||

fs/nfs/nfs4proc.c

+4 −7
Original line number Diff line number Diff line
@@ -1424,7 +1424,6 @@ static int nfs4_get_referral(struct inode *dir, struct qstr *name, struct nfs_fa 
	int status = -ENOMEM;

	struct page *page = NULL;

	struct nfs4_fs_locations *locations = NULL;

	struct dentry dentry = {};



	page = alloc_page(GFP_KERNEL);

	if (page == NULL)
@@ -1433,9 +1432,7 @@ static int nfs4_get_referral(struct inode *dir, struct qstr *name, struct nfs_fa 
	if (locations == NULL)

		goto out;



	dentry.d_name.name = name->name;

	dentry.d_name.len = name->len;

	status = nfs4_proc_fs_locations(dir, &dentry, locations, page);

	status = nfs4_proc_fs_locations(dir, name, locations, page);

	if (status != 0)

		goto out;

	/* Make sure server returned a different fsid for the referral */
@@ -3585,7 +3582,7 @@ ssize_t nfs4_listxattr(struct dentry *dentry, char *buf, size_t buflen) 
	return len;

}



int nfs4_proc_fs_locations(struct inode *dir, struct dentry *dentry,

int nfs4_proc_fs_locations(struct inode *dir, struct qstr *name,

		struct nfs4_fs_locations *fs_locations, struct page *page)

{

	struct nfs_server *server = NFS_SERVER(dir);
@@ -3595,7 +3592,7 @@ int nfs4_proc_fs_locations(struct inode *dir, struct dentry *dentry, 
	};

	struct nfs4_fs_locations_arg args = {

		.dir_fh = NFS_FH(dir),

		.name = &dentry->d_name,

		.name = name,

		.page = page,

		.bitmask = bitmask,

	};
@@ -3607,7 +3604,7 @@ int nfs4_proc_fs_locations(struct inode *dir, struct dentry *dentry, 
	int status;



	dprintk("%s: start\n", __FUNCTION__);

	fs_locations->fattr.valid = 0;

	nfs_fattr_init(&fs_locations->fattr);

	fs_locations->server = server;

	fs_locations->nlocations = 0;

	status = rpc_call_sync(server->client, &msg, 0);