svcrpc: share some setup of listening sockets

There's some duplicate code here.

Signed-off-by: J. Bruce Fields <bfields@redhat.com>

diff --git a/include/linux/sunrpc/svc_xprt.h b/include/linux/sunrpc/svc_xprt.h
index b3f64b12f1415f7e14d1f49cdeca4ccf7de20f0f..73c7a68667ea7c9f7e0e152f93d028db62da1b08 100644 (file)
--- a/include/linux/sunrpc/svc_xprt.h
+++ b/include/linux/sunrpc/svc_xprt.h
@@ -124,6 +124,7 @@ struct      svc_xprt *svc_find_xprt(struct svc_serv *serv, const char *xcl_name,
                        struct net *net, const sa_family_t af,
                        const unsigned short port);
 int    svc_xprt_names(struct svc_serv *serv, char *buf, const int buflen);
+void   svc_add_new_perm_xprt(struct svc_serv *serv, struct svc_xprt *xprt);
 
 static inline void svc_xprt_get(struct svc_xprt *xprt)
 {

diff --git a/net/sunrpc/svc_xprt.c b/net/sunrpc/svc_xprt.c
index 4801fdac2c9d3fee4714e3f13c9b94670437a8fc..ee15663798b373f76b07118cd5c9e04e6c899062 100644 (file)
--- a/net/sunrpc/svc_xprt.c
+++ b/net/sunrpc/svc_xprt.c
@@ -208,6 +208,15 @@ static struct svc_xprt *__svc_xpo_create(struct svc_xprt_class *xcl,
        return xcl->xcl_ops->xpo_create(serv, net, sap, len, flags);
 }
 
+void svc_add_new_perm_xprt(struct svc_serv *serv, struct svc_xprt *new)
+{
+       clear_bit(XPT_TEMP, &new->xpt_flags);
+       spin_lock_bh(&serv->sv_lock);
+       list_add(&new->xpt_list, &serv->sv_permsocks);
+       spin_unlock_bh(&serv->sv_lock);
+       svc_xprt_received(new);
+}
+
 int svc_create_xprt(struct svc_serv *serv, const char *xprt_name,
                    struct net *net, const int family,
                    const unsigned short port, int flags)
@@ -232,13 +241,8 @@ int svc_create_xprt(struct svc_serv *serv, const char *xprt_name,
                        module_put(xcl->xcl_owner);
                        return PTR_ERR(newxprt);
                }
-
-               clear_bit(XPT_TEMP, &newxprt->xpt_flags);
-               spin_lock_bh(&serv->sv_lock);
-               list_add(&newxprt->xpt_list, &serv->sv_permsocks);
-               spin_unlock_bh(&serv->sv_lock);
+               svc_add_new_perm_xprt(serv, newxprt);
                newport = svc_xprt_local_port(newxprt);
-               svc_xprt_received(newxprt);
                return newport;
        }
  err:

diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c
index bf10b723f429032514c2fd8e52afc37e54b9775c..c7a7b14f54edcd899c1b621af3008c775626163c 100644 (file)
--- a/net/sunrpc/svcsock.c
+++ b/net/sunrpc/svcsock.c
@@ -1478,11 +1478,7 @@ int svc_addsock(struct svc_serv *serv, const int fd, char *name_return,
        }
        if (kernel_getsockname(svsk->sk_sock, sin, &salen) == 0)
                svc_xprt_set_local(&svsk->sk_xprt, sin, salen);
-       clear_bit(XPT_TEMP, &svsk->sk_xprt.xpt_flags);
-       spin_lock_bh(&serv->sv_lock);
-       list_add(&svsk->sk_xprt.xpt_list, &serv->sv_permsocks);
-       spin_unlock_bh(&serv->sv_lock);
-       svc_xprt_received(&svsk->sk_xprt);
+       svc_add_new_perm_xprt(serv, &svsk->sk_xprt);
        return svc_one_sock_name(svsk, name_return, len);
 out:
        sockfd_put(so);