diff options
| author | NeilBrown <neilb@suse.de> | 2021-11-29 15:51:25 +1100 |
|---|---|---|
| committer | Chuck Lever <chuck.lever@oracle.com> | 2021-12-13 13:42:50 -0500 |
| commit | df5e49c880ea0776806b8a9f8ab95e035272cf6f (patch) | |
| tree | 57020650034662cd4daa43163b5e06403b801997 /fs | |
| parent | 89b24336f03a8ba560e96b0c47a8434a7fa48e3c (diff) | |
| download | linux-df5e49c880ea0776806b8a9f8ab95e035272cf6f.tar.bz2 | |
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>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/lockd/svc.c | 6 | ||||
| -rw-r--r-- | fs/nfs/callback.c | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c index b220e1b91726..2f50d5b2a8a4 100644 --- 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 86d856de1389..6e5e742a42b8 100644 --- 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: |