Commit df5e49c8 authored Nov 29, 2021 by NeilBrown Committed by Chuck Lever Dec 13, 2021

SUNRPC: change svc_get() to return the svc.



It is common for 'get' functions to return the object that was 'got',
and there are a couple of places where users of svc_get() would be a
little simpler if svc_get() did that.

Make it so.

Signed-off-by: NeilBrown <neilb@suse.de>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>

parent 89b24336

fs/lockd/svc.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -430,14 +430,12 @@ static struct svc_serv *lockd_create_svc(void)
		/*
		* Check whether we're already up and running.
		*/
		if (nlmsvc_rqst) {
		if (nlmsvc_rqst)
		/*
		* Note: increase service usage, because later in case of error
		* svc_destroy() will be called.
		*/
		svc_get(nlmsvc_rqst->rq_server);
		return nlmsvc_rqst->rq_server;
		}
		return svc_get(nlmsvc_rqst->rq_server);

		/*
		* Sanity check: if there's no pid,

fs/nfs/callback.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -266,14 +266,12 @@ static struct svc_serv *nfs_callback_create_svc(int minorversion)
		/*
		* Check whether we're already up and running.
		*/
		if (cb_info->serv) {
		if (cb_info->serv)
		/*
		* Note: increase service usage, because later in case of error
		* svc_destroy() will be called.
		*/
		svc_get(cb_info->serv);
		return cb_info->serv;
		}
		return svc_get(cb_info->serv);

		switch (minorversion) {
		case 0:

include/linux/sunrpc/svc.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -120,9 +120,10 @@ struct svc_serv {
		* change the number of threads. Horrible, but there it is.
		* Should be called with the "service mutex" held.
		*/
		static inline void svc_get(struct svc_serv *serv)
		static inline struct svc_serv svc_get(struct svc_serv serv)
		{
		serv->sv_nrthreads++;
		return serv;
		}

		/*