Fix NFS compilation in -git9
PATCH 1/1 Fix NFS compilation in -git9
Needed to fix NFS compilation
fs/nfs/internal.h +5 -0
@@ -1,3 +1,6 @@ +#ifndef INTERNAL_H +#define INTERNAL_H 1 +/* * NFS internal definitions */
@@ -184,3 +187,5 @@ static inline int valid_ipaddr4(const ch }return 0 ; } + +#endif
Review
Quoted 2 lines · Andi Kleen
(quoted diff) +2
-0+#ifndef INTERNAL_H +#define INTERNAL_H 1
Is the wrong fix. "internal.h" should not be included more than once per C file. One of the C files has acquired two inclusions of "internal.h", probably due to a git merge tool error.
I've given Trond the attached patch to fix things up. Note the change to nfs2xdr.c.
David
---
[PATCH] NFS: Fix up split of fs/nfs/inode.c
From: David Howells <[email protected]>
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.
(*) nfs2xdr.c shouldn't include internal.h twice.
Plus also:
(*) The sec_flavours[] table should really be const.
(*) A bit seems to have been lost from the changes to nfs_clear_inode(). The
BUG_ON() was replaced with nfs_wb_all().
!!! This needs checking by Trond !!!
---
fs/nfs/callback.c | 15 +++++++++++++++ fs/nfs/idmap.c | 14 ++++++++++++++ fs/nfs/inode.c | 5 +---- fs/nfs/internal.h | 12 ++++++------ fs/nfs/nfs2xdr.c | 2 -- fs/nfs/super.c | 40 ++++------------------------------------ 6 files changed, 40 insertions(+), 48 deletions(-)
fs/nfs/callback.c +15 -0
@@ -37,6 +37,21 @@ static struct svc_program nfs4_callback_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
@@ -57,6 +57,20 @@ #define IDMAP_HASH_SZ 128/* 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/inode.c +1 -4
@@ -80,10 +80,7 @@ void nfs_clear_inode(struct inode *inodestruct nfs_inode *nfsi =NFS_I (inode);struct rpc_cred *cred; -/* -* The following should never happen... -*/ -BUG_ON (nfs_have_writebacks (inode)); +nfs_wb_all (inode);BUG_ON (!list_empty (&nfsi->open_files));nfs_zap_acl_cache (inode); cred = nfsi->cache_access.cred;
fs/nfs/internal.h +6 -6
@@ -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 @@ #define nfs_destroy_directcache() do {}#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_procedurextern 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
@@ -94,15 +96,13 @@ extern char *nfs_path(const char *base,/* * 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/nfs2xdr.c +0 -2
@@ -25,8 +25,6 @@ #include <linux/nfs2.h>#include <linux/nfs_fs.h> #include "internal.h" -#include "internal.h" -#define NFSDBG_FACILITY NFSDBG_XDR/* #define NFS_PARANOIA 1 */
fs/nfs/super.c +4 -36
@@ -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 -/* * Register the NFS filesystems */
@@ -323,9 +289,12 @@ static int nfs_statfs(struct dentry *den } +/* +* 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[] = {
@@ -1363,7 +1332,6 @@ static int nfs4_get_sb(struct file_syste } s =sget (fs_type, nfs4_compare_super, nfs_set_super, server); -if (IS_ERR (s)) { error =PTR_ERR (s); goto out_free;