sock_diag: Simplify sock_diag_handlers[] handling in __sock_diag_rcv_msg

The sock_diag_lock_handler() and sock_diag_unlock_handler() actually
make the code less readable. Get rid of them and make the lock usage
and access to sock_diag_handlers[] clear on the first sight.

Signed-off-by: Mathias Krause <minipli@googlemail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/core/sock_diag.c b/net/core/sock_diag.c
index 750f44f3aa3117b578af1377ff07abb79032a612..a29e90cf36b75af6fd894494253cb6af554039c1 100644 (file)
--- a/net/core/sock_diag.c
+++ b/net/core/sock_diag.c
@@ -97,21 +97,6 @@ void sock_diag_unregister(const struct sock_diag_handler *hnld)
 }
 EXPORT_SYMBOL_GPL(sock_diag_unregister);
 
-static const inline struct sock_diag_handler *sock_diag_lock_handler(int family)
-{
-       if (sock_diag_handlers[family] == NULL)
-               request_module("net-pf-%d-proto-%d-type-%d", PF_NETLINK,
-                               NETLINK_SOCK_DIAG, family);
-
-       mutex_lock(&sock_diag_table_mutex);
-       return sock_diag_handlers[family];
-}
-
-static inline void sock_diag_unlock_handler(const struct sock_diag_handler *h)
-{
-       mutex_unlock(&sock_diag_table_mutex);
-}
-
 static int __sock_diag_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
 {
        int err;
@@ -124,12 +109,17 @@ static int __sock_diag_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
        if (req->sdiag_family >= AF_MAX)
                return -EINVAL;
 
-       hndl = sock_diag_lock_handler(req->sdiag_family);
+       if (sock_diag_handlers[req->sdiag_family] == NULL)
+               request_module("net-pf-%d-proto-%d-type-%d", PF_NETLINK,
+                               NETLINK_SOCK_DIAG, req->sdiag_family);
+
+       mutex_lock(&sock_diag_table_mutex);
+       hndl = sock_diag_handlers[req->sdiag_family];
        if (hndl == NULL)
                err = -ENOENT;
        else
                err = hndl->dump(skb, nlh);
-       sock_diag_unlock_handler(hndl);
+       mutex_unlock(&sock_diag_table_mutex);
 
        return err;
 }