Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 89d77c8f authored by Bryan Schumaker's avatar Bryan Schumaker Committed by Trond Myklebust
Browse files

NFS: Convert v4 into a module 



This patch exports symbols needed by the v4 module.  In addition, I also
switch over to using IS_ENABLED() to check if CONFIG_NFS_V4 or
CONFIG_NFS_V4_MODULE are set.

The module (nfs4.ko) will be created in the same directory as nfs.ko and
will be automatically loaded the first time you try to mount over NFS v4.

Signed-off-by: default avatarBryan Schumaker <bjschuma@netapp.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 1c606fb7

fs/nfs/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ config NFS_V3_ACL 
	  If unsure, say N.



config NFS_V4

	bool "NFS client support for NFS version 4"

	tristate "NFS client support for NFS version 4"

	depends on NFS_FS

	select SUNRPC_GSS

	select KEYS

fs/nfs/Makefile

+8 −11
Original line number Diff line number Diff line
@@ -9,17 +9,7 @@ nfs-y := client.o dir.o file.o getroot.o inode.o super.o \ 
			   write.o namespace.o mount_clnt.o \

			   dns_resolve.o cache_lib.o

nfs-$(CONFIG_ROOT_NFS)	+= nfsroot.o

nfs-$(CONFIG_NFS_V4)	+= nfs4proc.o nfs4xdr.o nfs4state.o nfs4renewd.o \

			   nfs4super.o nfs4file.o delegation.o idmap.o \

			   callback.o callback_xdr.o callback_proc.o \

			   nfs4namespace.o nfs4getroot.o nfs4client.o

nfs-$(CONFIG_NFS_V4_1)	+= pnfs.o pnfs_dev.o



ifeq ($(CONFIG_SYSCTL), y)

nfs-y += sysctl.o

nfs-$(CONFIG_NFS_V4) += nfs4sysctl.o

endif



nfs-$(CONFIG_SYSCTL)	+= sysctl.o

nfs-$(CONFIG_NFS_FSCACHE) += fscache.o fscache-index.o



obj-$(CONFIG_NFS_V2) += nfs2.o
@@ -29,6 +19,13 @@ obj-$(CONFIG_NFS_V3) += nfs3.o 
nfs3-y := nfs3super.o nfs3client.o nfs3proc.o nfs3xdr.o

nfs3-$(CONFIG_NFS_V3_ACL) += nfs3acl.o



obj-$(CONFIG_NFS_V4) += nfs4.o

nfs4-y := nfs4proc.o nfs4xdr.o nfs4state.o nfs4renewd.o nfs4super.o nfs4file.o \

	  delegation.o idmap.o callback.o callback_xdr.o callback_proc.o \

	  nfs4namespace.o nfs4getroot.o nfs4client.o

nfs4-$(CONFIG_SYSCTL)	+= nfs4sysctl.o

nfs4-$(CONFIG_NFS_V4_1)	+= pnfs.o pnfs_dev.o



obj-$(CONFIG_PNFS_FILE_LAYOUT) += nfs_layout_nfsv41_files.o

nfs_layout_nfsv41_files-y := nfs4filelayout.o nfs4filelayoutdev.o

fs/nfs/callback.h

+1 −1
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ extern __be32 nfs4_callback_getattr(struct cb_getattrargs *args, 
				    struct cb_process_state *cps);

extern __be32 nfs4_callback_recall(struct cb_recallargs *args, void *dummy,

				   struct cb_process_state *cps);

#ifdef CONFIG_NFS_V4

#if IS_ENABLED(CONFIG_NFS_V4)

extern int nfs_callback_up(u32 minorversion, struct rpc_xprt *xprt);

extern void nfs_callback_down(int minorversion);

extern int nfs4_validate_delegation_stateid(struct nfs_delegation *delegation,

fs/nfs/client.c

+14 −20
Original line number Diff line number Diff line
@@ -142,24 +142,6 @@ void unregister_nfs_version(struct nfs_subversion *nfs) 
}

EXPORT_SYMBOL_GPL(unregister_nfs_version);



/*

 * Preload all configured NFS versions during module init.

 * This function should be edited after each protocol is converted,

 * and eventually removed.

 */

int __init nfs_register_versions(void)

{

	return init_nfs_v4();

}



/*

 * Remove each pre-loaded NFS version

 */

void nfs_unregister_versions(void)

{

	exit_nfs_v4();

}



/*

 * Allocate a shared client record

 *
@@ -214,7 +196,7 @@ struct nfs_client *nfs_alloc_client(const struct nfs_client_initdata *cl_init) 
}

EXPORT_SYMBOL_GPL(nfs_alloc_client);



#ifdef CONFIG_NFS_V4

#if IS_ENABLED(CONFIG_NFS_V4)

/* idr_remove_all is not needed as all id's are removed by nfs_put_client */

void nfs_cleanup_cb_ident_idr(struct net *net)

{
@@ -390,6 +372,7 @@ int nfs_sockaddr_match_ipaddr(const struct sockaddr *sa1, 
	}

	return 0;

}

EXPORT_SYMBOL_GPL(nfs_sockaddr_match_ipaddr);

#endif /* CONFIG_NFS_V4_1 */



/*
@@ -456,6 +439,7 @@ int nfs_wait_client_init_complete(const struct nfs_client *clp) 
	return wait_event_killable(nfs_client_active_wq,

			nfs_client_init_is_complete(clp));

}

EXPORT_SYMBOL_GPL(nfs_wait_client_init_complete);



/*

 * Found an existing client.  Make sure it's ready before returning.
@@ -530,6 +514,7 @@ nfs_get_client(const struct nfs_client_initdata *cl_init, 
		cl_init->hostname ?: "", PTR_ERR(new));

	return new;

}

EXPORT_SYMBOL_GPL(nfs_get_client);



/*

 * Mark a server as ready or failed
@@ -540,6 +525,7 @@ void nfs_mark_client_ready(struct nfs_client *clp, int state) 
	clp->cl_cons_state = state;

	wake_up_all(&nfs_client_active_wq);

}

EXPORT_SYMBOL_GPL(nfs_mark_client_ready);



/*

 * Initialise the timeout values for a connection
@@ -581,6 +567,7 @@ void nfs_init_timeout_values(struct rpc_timeout *to, int proto, 
		BUG();

	}

}

EXPORT_SYMBOL_GPL(nfs_init_timeout_values);



/*

 * Create an RPC client handle
@@ -620,6 +607,7 @@ int nfs_create_rpc_client(struct nfs_client *clp, 
	clp->cl_rpcclient = clnt;

	return 0;

}

EXPORT_SYMBOL_GPL(nfs_create_rpc_client);



/*

 * Version 2 or 3 client destruction
@@ -706,6 +694,7 @@ int nfs_init_server_rpcclient(struct nfs_server *server, 


	return 0;

}

EXPORT_SYMBOL_GPL(nfs_init_server_rpcclient);



/**

 * nfs_init_client - Initialise an NFS2 or NFS3 client
@@ -932,6 +921,7 @@ int nfs_probe_fsinfo(struct nfs_server *server, struct nfs_fh *mntfh, struct nfs 
	dprintk("nfs_probe_fsinfo: error = %d\n", -error);

	return error;

}

EXPORT_SYMBOL_GPL(nfs_probe_fsinfo);



/*

 * Copy useful information when duplicating a server record
@@ -948,6 +938,7 @@ void nfs_server_copy_userdata(struct nfs_server *target, struct nfs_server *sour 
	target->caps = source->caps;

	target->options = source->options;

}

EXPORT_SYMBOL_GPL(nfs_server_copy_userdata);



void nfs_server_insert_lists(struct nfs_server *server)

{
@@ -961,6 +952,7 @@ void nfs_server_insert_lists(struct nfs_server *server) 
	spin_unlock(&nn->nfs_client_lock);



}

EXPORT_SYMBOL_GPL(nfs_server_insert_lists);



static void nfs_server_remove_lists(struct nfs_server *server)

{
@@ -1020,6 +1012,7 @@ struct nfs_server *nfs_alloc_server(void) 


	return server;

}

EXPORT_SYMBOL_GPL(nfs_alloc_server);



/*

 * Free up a server record
@@ -1048,6 +1041,7 @@ void nfs_free_server(struct nfs_server *server) 
	nfs_release_automount_timer();

	dprintk("<-- nfs_free_server()\n");

}

EXPORT_SYMBOL_GPL(nfs_free_server);



/*

 * Create a version 2 or 3 volume record
@@ -1193,7 +1187,7 @@ void nfs_clients_init(struct net *net) 


	INIT_LIST_HEAD(&nn->nfs_client_list);

	INIT_LIST_HEAD(&nn->nfs_volume_list);

#ifdef CONFIG_NFS_V4

#if IS_ENABLED(CONFIG_NFS_V4)

	idr_init(&nn->cb_ident_idr);

#endif

	spin_lock_init(&nn->nfs_client_lock);

fs/nfs/delegation.h

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
#ifndef FS_NFS_DELEGATION_H

#define FS_NFS_DELEGATION_H



#if defined(CONFIG_NFS_V4)

#if IS_ENABLED(CONFIG_NFS_V4)

/*

 * NFSv4 delegation

 */