Commit 24c3767e authored by Trond Myklebust's avatar Trond Myklebust Committed by J. Bruce Fields
Browse files

SUNRPC: The sunrpc server code should not be used by out-of-tree modules 



Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
parent 22945e4a

net/sunrpc/cache.c

+10 −10
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ struct cache_head *sunrpc_cache_lookup(struct cache_detail *detail, 


	return new;

}

EXPORT_SYMBOL(sunrpc_cache_lookup);

EXPORT_SYMBOL_GPL(sunrpc_cache_lookup);





static void queue_loose(struct cache_detail *detail, struct cache_head *ch);
@@ -173,7 +173,7 @@ struct cache_head *sunrpc_cache_update(struct cache_detail *detail, 
	cache_put(old, detail);

	return tmp;

}

EXPORT_SYMBOL(sunrpc_cache_update);

EXPORT_SYMBOL_GPL(sunrpc_cache_update);



static int cache_make_upcall(struct cache_detail *detail, struct cache_head *h);

/*
@@ -245,7 +245,7 @@ int cache_check(struct cache_detail *detail, 
		cache_put(h, detail);

	return rv;

}

EXPORT_SYMBOL(cache_check);

EXPORT_SYMBOL_GPL(cache_check);



/*

 * caches need to be periodically cleaned.
@@ -373,7 +373,7 @@ int cache_register(struct cache_detail *cd) 
	schedule_delayed_work(&cache_cleaner, 0);

	return 0;

}

EXPORT_SYMBOL(cache_register);

EXPORT_SYMBOL_GPL(cache_register);



void cache_unregister(struct cache_detail *cd)

{
@@ -399,7 +399,7 @@ void cache_unregister(struct cache_detail *cd) 
out:

	printk(KERN_ERR "nfsd: failed to unregister %s cache\n", cd->name);

}

EXPORT_SYMBOL(cache_unregister);

EXPORT_SYMBOL_GPL(cache_unregister);



/* clean cache tries to find something to clean

 * and cleans it.
@@ -514,7 +514,7 @@ void cache_flush(void) 
	while (cache_clean() != -1)

		cond_resched();

}

EXPORT_SYMBOL(cache_flush);

EXPORT_SYMBOL_GPL(cache_flush);



void cache_purge(struct cache_detail *detail)

{
@@ -523,7 +523,7 @@ void cache_purge(struct cache_detail *detail) 
	cache_flush();

	detail->flush_time = 1;

}

EXPORT_SYMBOL(cache_purge);

EXPORT_SYMBOL_GPL(cache_purge);





/*
@@ -988,7 +988,7 @@ void qword_add(char **bpp, int *lp, char *str) 
	*bpp = bp;

	*lp = len;

}

EXPORT_SYMBOL(qword_add);

EXPORT_SYMBOL_GPL(qword_add);



void qword_addhex(char **bpp, int *lp, char *buf, int blen)

{
@@ -1017,7 +1017,7 @@ void qword_addhex(char **bpp, int *lp, char *buf, int blen) 
	*bpp = bp;

	*lp = len;

}

EXPORT_SYMBOL(qword_addhex);

EXPORT_SYMBOL_GPL(qword_addhex);



static void warn_no_listener(struct cache_detail *detail)

{
@@ -1140,7 +1140,7 @@ int qword_get(char **bpp, char *dest, int bufsize) 
	*dest = '\0';

	return len;

}

EXPORT_SYMBOL(qword_get);

EXPORT_SYMBOL_GPL(qword_get);





/*

net/sunrpc/stats.c

+3 −3
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ void svc_seq_show(struct seq_file *seq, const struct svc_stat *statp) { 
		seq_putc(seq, '\n');

	}

}

EXPORT_SYMBOL(svc_seq_show);

EXPORT_SYMBOL_GPL(svc_seq_show);



/**

 * rpc_alloc_iostats - allocate an rpc_iostats structure
@@ -249,14 +249,14 @@ svc_proc_register(struct svc_stat *statp, const struct file_operations *fops) 
{

	return do_register(statp->program->pg_name, statp, fops);

}

EXPORT_SYMBOL(svc_proc_register);

EXPORT_SYMBOL_GPL(svc_proc_register);



void

svc_proc_unregister(const char *name)

{

	remove_proc_entry(name, proc_net_rpc);

}

EXPORT_SYMBOL(svc_proc_unregister);

EXPORT_SYMBOL_GPL(svc_proc_unregister);



void

rpc_proc_init(void)

net/sunrpc/svc.c

+7 −7
Original line number Diff line number Diff line
@@ -431,7 +431,7 @@ svc_create(struct svc_program *prog, unsigned int bufsize, 
{

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

}

EXPORT_SYMBOL(svc_create);

EXPORT_SYMBOL_GPL(svc_create);



struct svc_serv *

svc_create_pooled(struct svc_program *prog, unsigned int bufsize,
@@ -450,7 +450,7 @@ svc_create_pooled(struct svc_program *prog, unsigned int bufsize, 


	return serv;

}

EXPORT_SYMBOL(svc_create_pooled);

EXPORT_SYMBOL_GPL(svc_create_pooled);



/*

 * Destroy an RPC service. Should be called with appropriate locking to
@@ -492,7 +492,7 @@ svc_destroy(struct svc_serv *serv) 
	kfree(serv->sv_pools);

	kfree(serv);

}

EXPORT_SYMBOL(svc_destroy);

EXPORT_SYMBOL_GPL(svc_destroy);



/*

 * Allocate an RPC server's buffer space.
@@ -567,7 +567,7 @@ svc_prepare_thread(struct svc_serv *serv, struct svc_pool *pool) 
out_enomem:

	return ERR_PTR(-ENOMEM);

}

EXPORT_SYMBOL(svc_prepare_thread);

EXPORT_SYMBOL_GPL(svc_prepare_thread);



/*

 * Choose a pool in which to create a new thread, for svc_set_num_threads
@@ -689,7 +689,7 @@ svc_set_num_threads(struct svc_serv *serv, struct svc_pool *pool, int nrservs) 


	return error;

}

EXPORT_SYMBOL(svc_set_num_threads);

EXPORT_SYMBOL_GPL(svc_set_num_threads);



/*

 * Called from a server thread as it's exiting. Caller must hold the BKL or
@@ -717,7 +717,7 @@ svc_exit_thread(struct svc_rqst *rqstp) 
	if (serv)

		svc_destroy(serv);

}

EXPORT_SYMBOL(svc_exit_thread);

EXPORT_SYMBOL_GPL(svc_exit_thread);



#ifdef CONFIG_SUNRPC_REGISTER_V4
@@ -1231,7 +1231,7 @@ svc_process(struct svc_rqst *rqstp) 
	svc_putnl(resv, ntohl(rpc_stat));

	goto sendit;

}

EXPORT_SYMBOL(svc_process);

EXPORT_SYMBOL_GPL(svc_process);



/*

 * Return (transport-specific) limit on the rpc payload.

net/sunrpc/svc_xprt.c

+4 −4
Original line number Diff line number Diff line
@@ -440,7 +440,7 @@ void svc_reserve(struct svc_rqst *rqstp, int space) 
		svc_xprt_enqueue(xprt);

	}

}

EXPORT_SYMBOL(svc_reserve);

EXPORT_SYMBOL_GPL(svc_reserve);



static void svc_xprt_release(struct svc_rqst *rqstp)

{
@@ -501,7 +501,7 @@ void svc_wake_up(struct svc_serv *serv) 
		spin_unlock_bh(&pool->sp_lock);

	}

}

EXPORT_SYMBOL(svc_wake_up);

EXPORT_SYMBOL_GPL(svc_wake_up);



int svc_port_is_privileged(struct sockaddr *sin)

{
@@ -743,7 +743,7 @@ int svc_recv(struct svc_rqst *rqstp, long timeout) 
		serv->sv_stats->netcnt++;

	return len;

}

EXPORT_SYMBOL(svc_recv);

EXPORT_SYMBOL_GPL(svc_recv);



/*

 * Drop request
@@ -753,7 +753,7 @@ void svc_drop(struct svc_rqst *rqstp) 
	dprintk("svc: xprt %p dropped request\n", rqstp->rq_xprt);

	svc_xprt_release(rqstp);

}

EXPORT_SYMBOL(svc_drop);

EXPORT_SYMBOL_GPL(svc_drop);



/*

 * Return reply to client.

net/sunrpc/svcauth.c

+7 −7
Original line number Diff line number Diff line
@@ -57,13 +57,13 @@ svc_authenticate(struct svc_rqst *rqstp, __be32 *authp) 
	rqstp->rq_authop = aops;

	return aops->accept(rqstp, authp);

}

EXPORT_SYMBOL(svc_authenticate);

EXPORT_SYMBOL_GPL(svc_authenticate);



int svc_set_client(struct svc_rqst *rqstp)

{

	return rqstp->rq_authop->set_client(rqstp);

}

EXPORT_SYMBOL(svc_set_client);

EXPORT_SYMBOL_GPL(svc_set_client);



/* A request, which was authenticated, has now executed.

 * Time to finalise the credentials and verifier
@@ -95,7 +95,7 @@ svc_auth_register(rpc_authflavor_t flavor, struct auth_ops *aops) 
	spin_unlock(&authtab_lock);

	return rv;

}

EXPORT_SYMBOL(svc_auth_register);

EXPORT_SYMBOL_GPL(svc_auth_register);



void

svc_auth_unregister(rpc_authflavor_t flavor)
@@ -105,7 +105,7 @@ svc_auth_unregister(rpc_authflavor_t flavor) 
		authtab[flavor] = NULL;

	spin_unlock(&authtab_lock);

}

EXPORT_SYMBOL(svc_auth_unregister);

EXPORT_SYMBOL_GPL(svc_auth_unregister);



/**************************************************

 * 'auth_domains' are stored in a hash table indexed by name.
@@ -132,7 +132,7 @@ void auth_domain_put(struct auth_domain *dom) 
		spin_unlock(&auth_domain_lock);

	}

}

EXPORT_SYMBOL(auth_domain_put);

EXPORT_SYMBOL_GPL(auth_domain_put);



struct auth_domain *

auth_domain_lookup(char *name, struct auth_domain *new)
@@ -157,10 +157,10 @@ auth_domain_lookup(char *name, struct auth_domain *new) 
	spin_unlock(&auth_domain_lock);

	return new;

}

EXPORT_SYMBOL(auth_domain_lookup);

EXPORT_SYMBOL_GPL(auth_domain_lookup);



struct auth_domain *auth_domain_find(char *name)

{

	return auth_domain_lookup(name, NULL);

}

EXPORT_SYMBOL(auth_domain_find);
 
EXPORT_SYMBOL_GPL(auth_domain_find);