From patchwork Sat Nov 22 08:40:10 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Dumazet X-Patchwork-Id: 10208 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 163D6DDDFB for ; Sat, 22 Nov 2008 19:40:26 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751561AbYKVIkQ (ORCPT ); Sat, 22 Nov 2008 03:40:16 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751110AbYKVIkQ (ORCPT ); Sat, 22 Nov 2008 03:40:16 -0500 Received: from gw1.cosmosbay.com ([86.65.150.130]:44037 "EHLO gw1.cosmosbay.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751072AbYKVIkP (ORCPT ); Sat, 22 Nov 2008 03:40:15 -0500 Received: from [127.0.0.1] (localhost [127.0.0.1]) by gw1.cosmosbay.com (8.13.7/8.13.7) with ESMTP id mAM8eAZG010780; Sat, 22 Nov 2008 09:40:10 +0100 Message-ID: <4927C56A.5080307@cosmosbay.com> Date: Sat, 22 Nov 2008 09:40:10 +0100 From: Eric Dumazet User-Agent: Thunderbird 2.0.0.17 (Windows/20080914) MIME-Version: 1.0 To: "David S. Miller" CC: Linux Netdev List Subject: [PATCH] net: af_netlink should update its inuse counter X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-1.6 (gw1.cosmosbay.com [0.0.0.0]); Sat, 22 Nov 2008 09:40:10 +0100 (CET) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org In order to have relevant information for NETLINK protocol, in /proc/net/protocols, we should use sock_prot_inuse_add() to update a (percpu and pernamespace) counter of inuse sockets. Signed-off-by: Eric Dumazet diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c index 480184a..a2071dc 100644 --- a/net/netlink/af_netlink.c +++ b/net/netlink/af_netlink.c @@ -452,6 +452,7 @@ static int netlink_create(struct net *net, struct socket *sock, int protocol) if (err < 0) goto out_module; + sock_prot_inuse_add(net, &netlink_proto, 1); nlk = nlk_sk(sock->sk); nlk->module = module; out: @@ -511,6 +512,7 @@ static int netlink_release(struct socket *sock) kfree(nlk->groups); nlk->groups = NULL; + sock_prot_inuse_add(sock_net(sk), &netlink_proto, -1); sock_put(sk); return 0; }