SUNRPC: change svc_get() to return the svc.

[ Upstream commit df5e49c880ea0776806b8a9f8ab95e035272cf6f ]

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>

diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c
index b220e1b9172683b798cf83fecb2ba30c6197c1b7..2f50d5b2a8a429aa9e62f2bb8a43a49fd06ecdf6 100644 (file)
--- a/fs/lockd/svc.c
+++ b/fs/lockd/svc.c
@@ -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,

diff --git a/fs/nfs/callback.c b/fs/nfs/callback.c
index 3c86a559a321ae6e006f66957220e51a82d52f64..674198e0eb5e139cbb964090ff57b8c44b4cdda8 100644 (file)
--- a/fs/nfs/callback.c
+++ b/fs/nfs/callback.c
@@ -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:

diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h
index 4813cc5613f27552461385ec1bd9218ee20b9ab9..80d44df8663dbf2ed6f1df756de595704c9cdc33 100644 (file)
--- a/include/linux/sunrpc/svc.h
+++ b/include/linux/sunrpc/svc.h
@@ -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;
 }
 
 /*