Commit 7d4e2747 authored by David Howells's avatar David Howells Committed by Trond Myklebust
Browse files

NFS: Fix up split of fs/nfs/inode.c 



Fix ups for the splitting of the superblock stuff out of fs/nfs/inode.c,
including:

 (*) Move the callback tcpport module param into callback.c.

 (*) Move the idmap cache timeout module param into idmap.c.

 (*) Changes to internal.h:

     (*) namespace-nfs4.c was renamed to nfs4namespace.c.

     (*) nfs_stat_to_errno() is in nfs2xdr.c, not nfs4xdr.c.

     (*) nfs4xdr.c is contingent on CONFIG_NFS_V4.

     (*) nfs4_path() is only uses if CONFIG_NFS_V4 is set.

Plus also:

 (*) The sec_flavours[] table should really be const.

Signed-Off-By: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 770bfad8

fs/nfs/callback.c

+15 −0
Original line number Diff line number Diff line
@@ -36,6 +36,21 @@ static struct svc_program nfs4_callback_program; 


unsigned int nfs_callback_set_tcpport;

unsigned short nfs_callback_tcpport;

static const int nfs_set_port_min = 0;

static const int nfs_set_port_max = 65535;



static int param_set_port(const char *val, struct kernel_param *kp)

{

	char *endp;

	int num = simple_strtol(val, &endp, 0);

	if (endp == val || *endp || num < nfs_set_port_min || num > nfs_set_port_max)

		return -EINVAL;

	*((int *)kp->arg) = num;

	return 0;

}



module_param_call(callback_tcpport, param_set_port, param_get_int,

		 &nfs_callback_set_tcpport, 0644);



/*

 * This is the callback kernel thread.

fs/nfs/idmap.c

+14 −0
Original line number Diff line number Diff line
@@ -57,6 +57,20 @@ 
/* Default cache timeout is 10 minutes */

unsigned int nfs_idmap_cache_timeout = 600 * HZ;



static int param_set_idmap_timeout(const char *val, struct kernel_param *kp)

{

	char *endp;

	int num = simple_strtol(val, &endp, 0);

	int jif = num * HZ;

	if (endp == val || *endp || num < 0 || jif < num)

		return -EINVAL;

	*((int *)kp->arg) = jif;

	return 0;

}



module_param_call(idmap_cache_timeout, param_set_idmap_timeout, param_get_int,

		 &nfs_idmap_cache_timeout, 0644);



struct idmap_hashent {

	unsigned long ih_expires;

	__u32 ih_id;

fs/nfs/internal.h

+6 −6
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ struct nfs_clone_mount { 
	rpc_authflavor_t authflavor;

};



/* namespace-nfs4.c */

/* nfs4namespace.c */

#ifdef CONFIG_NFS_V4

extern struct vfsmount *nfs_do_refmount(const struct vfsmount *mnt_parent, struct dentry *dentry);

#else
@@ -46,6 +46,7 @@ extern void nfs_destroy_directcache(void); 
#endif



/* nfs2xdr.c */

extern int nfs_stat_to_errno(int);

extern struct rpc_procinfo nfs_procedures[];

extern u32 * nfs_decode_dirent(u32 *, struct nfs_entry *, int);
@@ -54,8 +55,9 @@ extern struct rpc_procinfo nfs3_procedures[]; 
extern u32 *nfs3_decode_dirent(u32 *, struct nfs_entry *, int);



/* nfs4xdr.c */

extern int nfs_stat_to_errno(int);

#ifdef CONFIG_NFS_V4

extern u32 *nfs4_decode_dirent(u32 *p, struct nfs_entry *entry, int plus);

#endif



/* nfs4proc.c */

#ifdef CONFIG_NFS_V4
@@ -97,15 +99,13 @@ extern char *nfs_path(const char *base, const struct dentry *dentry, 
/*

 * Determine the mount path as a string

 */

#ifdef CONFIG_NFS_V4

static inline char *

nfs4_path(const struct dentry *dentry, char *buffer, ssize_t buflen)

{

#ifdef CONFIG_NFS_V4

	return nfs_path(NFS_SB(dentry->d_sb)->mnt_path, dentry, buffer, buflen);

#else

	return NULL;

#endif

}

#endif



/*

 * Determine the device name as a string

fs/nfs/super.c

+4 −36
Original line number Diff line number Diff line
@@ -187,40 +187,6 @@ static struct super_operations nfs4_sops = { 
};

#endif



#ifdef CONFIG_NFS_V4

static const int nfs_set_port_min = 0;

static const int nfs_set_port_max = 65535;



static int param_set_port(const char *val, struct kernel_param *kp)

{

	char *endp;

	int num = simple_strtol(val, &endp, 0);

	if (endp == val || *endp || num < nfs_set_port_min || num > nfs_set_port_max)

		return -EINVAL;

	*((int *)kp->arg) = num;

	return 0;

}



module_param_call(callback_tcpport, param_set_port, param_get_int,

		 &nfs_callback_set_tcpport, 0644);

#endif



#ifdef CONFIG_NFS_V4

static int param_set_idmap_timeout(const char *val, struct kernel_param *kp)

{

	char *endp;

	int num = simple_strtol(val, &endp, 0);

	int jif = num * HZ;

	if (endp == val || *endp || num < 0 || jif < num)

		return -EINVAL;

	*((int *)kp->arg) = jif;

	return 0;

}



module_param_call(idmap_cache_timeout, param_set_idmap_timeout, param_get_int,

		 &nfs_idmap_cache_timeout, 0644);

#endif



static struct shrinker *acl_shrinker;



/*
@@ -328,9 +294,12 @@ static int nfs_statfs(struct dentry *dentry, struct kstatfs *buf) 


}



/*

 * Map the security flavour number to a name

 */

static const char *nfs_pseudoflavour_to_name(rpc_authflavor_t flavour)

{

	static struct {

	static const struct {

		rpc_authflavor_t flavour;

		const char *str;

	} sec_flavours[] = {
@@ -1368,7 +1337,6 @@ static int nfs4_get_sb(struct file_system_type *fs_type, 
	}



	s = sget(fs_type, nfs4_compare_super, nfs_set_super, server);



	if (IS_ERR(s)) {

		error = PTR_ERR(s);

		goto out_free;