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

Commit e851db5b authored by Chuck Lever's avatar Chuck Lever Committed by J. Bruce Fields
Browse files

SUNRPC: Add address family field to svc_serv data structure 



Introduce and initialize an address family field in the svc_serv structure.

This field will determine what family to use for the service's listener
sockets and what families are advertised via the local rpcbind daemon.

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
parent 72d31053

fs/lockd/svc.c

+1 −1
Original line number Diff line number Diff line
@@ -266,7 +266,7 @@ lockd_up(int proto) /* Maybe add a 'family' option when IPv6 is supported ?? */ 
			"lockd_up: no pid, %d users??\n", nlmsvc_users);



	error = -ENOMEM;

	serv = svc_create(&nlmsvc_program, LOCKD_BUFSIZE, NULL);

	serv = svc_create(&nlmsvc_program, LOCKD_BUFSIZE, AF_INET, NULL);

	if (!serv) {

		printk(KERN_WARNING "lockd_up: create service failed\n");

		goto out;

fs/nfs/callback.c

+2 −1
Original line number Diff line number Diff line
@@ -105,7 +105,8 @@ int nfs_callback_up(void) 
	mutex_lock(&nfs_callback_mutex);

	if (nfs_callback_info.users++ || nfs_callback_info.task != NULL)

		goto out;

	serv = svc_create(&nfs4_callback_program, NFS4_CALLBACK_BUFSIZE, NULL);

	serv = svc_create(&nfs4_callback_program, NFS4_CALLBACK_BUFSIZE,

				AF_INET, NULL);

	ret = -ENOMEM;

	if (!serv)

		goto out_err;

fs/nfsd/nfssvc.c

+1 −0
Original line number Diff line number Diff line
@@ -229,6 +229,7 @@ int nfsd_create_serv(void) 


	atomic_set(&nfsd_busy, 0);

	nfsd_serv = svc_create_pooled(&nfsd_program, nfsd_max_blksize,

				      AF_INET,

				      nfsd_last_thread, nfsd, THIS_MODULE);

	if (nfsd_serv == NULL)

		err = -ENOMEM;

include/linux/sunrpc/svc.h

+5 −4
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ struct svc_serv { 
	struct list_head	sv_tempsocks;	/* all temporary sockets */

	int			sv_tmpcnt;	/* count of temporary sockets */

	struct timer_list	sv_temptimer;	/* timer for aging temporary sockets */

	sa_family_t		sv_family;	/* listener's address family */



	char *			sv_name;	/* service name */
@@ -381,14 +382,14 @@ struct svc_procedure { 
/*

 * Function prototypes.

 */

struct svc_serv *  svc_create(struct svc_program *, unsigned int,

struct svc_serv *svc_create(struct svc_program *, unsigned int, sa_family_t,

			    void (*shutdown)(struct svc_serv *));

struct svc_rqst *svc_prepare_thread(struct svc_serv *serv,

					struct svc_pool *pool);

void		   svc_exit_thread(struct svc_rqst *);

struct svc_serv *  svc_create_pooled(struct svc_program *, unsigned int,

			void (*shutdown)(struct svc_serv*), svc_thread_fn,

			struct module *);

			sa_family_t, void (*shutdown)(struct svc_serv *),

			svc_thread_fn, struct module *);

int		   svc_set_num_threads(struct svc_serv *, struct svc_pool *, int);

void		   svc_destroy(struct svc_serv *);

int		   svc_process(struct svc_rqst *);

net/sunrpc/svc.c

+6 −5
Original line number Diff line number Diff line
@@ -357,7 +357,7 @@ svc_pool_for_cpu(struct svc_serv *serv, int cpu) 
 */

static struct svc_serv *

__svc_create(struct svc_program *prog, unsigned int bufsize, int npools,

	   void (*shutdown)(struct svc_serv *serv))

	   sa_family_t family, void (*shutdown)(struct svc_serv *serv))

{

	struct svc_serv	*serv;

	unsigned int vers;
@@ -366,6 +366,7 @@ __svc_create(struct svc_program *prog, unsigned int bufsize, int npools, 


	if (!(serv = kzalloc(sizeof(*serv), GFP_KERNEL)))

		return NULL;

	serv->sv_family    = family;

	serv->sv_name      = prog->pg_name;

	serv->sv_program   = prog;

	serv->sv_nrthreads = 1;
@@ -425,21 +426,21 @@ __svc_create(struct svc_program *prog, unsigned int bufsize, int npools, 


struct svc_serv *

svc_create(struct svc_program *prog, unsigned int bufsize,

		void (*shutdown)(struct svc_serv *serv))

		sa_family_t family, void (*shutdown)(struct svc_serv *serv))

{

	return __svc_create(prog, bufsize, /*npools*/1, shutdown);

	return __svc_create(prog, bufsize, /*npools*/1, family, shutdown);

}

EXPORT_SYMBOL(svc_create);



struct svc_serv *

svc_create_pooled(struct svc_program *prog, unsigned int bufsize,

		void (*shutdown)(struct svc_serv *serv),

		  sa_family_t family, void (*shutdown)(struct svc_serv *serv),

		  svc_thread_fn func, struct module *mod)

{

	struct svc_serv *serv;

	unsigned int npools = svc_pool_map_get();



	serv = __svc_create(prog, bufsize, npools, shutdown);

	serv = __svc_create(prog, bufsize, npools, family, shutdown);



	if (serv != NULL) {

		serv->sv_function = func;