From patchwork Thu Mar 8 15:55:59 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Poirier X-Patchwork-Id: 145560 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.180.67]) by ozlabs.org (Postfix) with ESMTP id E9106B6F9F for ; Fri, 9 Mar 2012 02:57:40 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758180Ab2CHP5J (ORCPT ); Thu, 8 Mar 2012 10:57:09 -0500 Received: from mail-yw0-f46.google.com ([209.85.213.46]:65016 "EHLO mail-yw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758005Ab2CHP5E (ORCPT ); Thu, 8 Mar 2012 10:57:04 -0500 Received: by yhmm54 with SMTP id m54so287490yhm.19 for ; Thu, 08 Mar 2012 07:57:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=heaGoqBQ4wbeJz9covffjp91uAiLEiftFBXJfXFOvGw=; b=dxjTguNDhiaTa+kOYgGzbVXNEazrJMeeq5X//ATd/TxS6DbbCYBpRD45ujqmdzGR25 Qu0CZIUYTAajU6JkhMdv0lKJdErf5RYAfxhpdJ0+6lG4f4nZA7fC+TI0qN/83pvUp1ej i5rCc4P61cJ7IrH5tyHUvRD/d91kHCW6iVL/XthqLee0jlEYGLnjh9ANL+r5vtel6wD0 8SHfOroU5asze/XpDI20i95J1pUxpkAAHqU8n6bjCGDLyQAMu+HBVJrkV9a26aB5U+rF uYzZ5H0TaF2yEFbqjJp/A1VFBlsn/Gj1RLlzjtJllG0gUB96lb3eh5/LXlYo9Q7NVLZY 0FtQ== Received: by 10.50.87.225 with SMTP id bb1mr7634173igb.13.1331222222997; Thu, 08 Mar 2012 07:57:02 -0800 (PST) Received: from localhost.localdomain (modemcable121.56-203-24.mc.videotron.ca. [24.203.56.121]) by mx.google.com with ESMTPS id ko6sm14847289igc.2.2012.03.08.07.57.01 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 08 Mar 2012 07:57:02 -0800 (PST) From: Benjamin Poirier To: "David S. Miller" Cc: Christine Caulfield , David Teigland , Vlad Yasevich , Sridhar Samudrala , cluster-devel@redhat.com, linux-sctp@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 2/2] dlm: Do not allocate a fd for peeloff Date: Thu, 8 Mar 2012 10:55:59 -0500 Message-Id: <1331222159-28980-2-git-send-email-bpoirier@suse.de> X-Mailer: git-send-email 1.7.7 In-Reply-To: <1331222159-28980-1-git-send-email-bpoirier@suse.de> References: <20120308.002447.1062706659978103072.davem@davemloft.net> <1331222159-28980-1-git-send-email-bpoirier@suse.de> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org avoids allocating a fd that a) propagates to every kernel thread and usermodehelper b) is not properly released. References: http://article.gmane.org/gmane.linux.network.drbd/22529 Signed-off-by: Benjamin Poirier --- fs/dlm/lowcomms.c | 22 ++++++++-------------- 1 files changed, 8 insertions(+), 14 deletions(-) diff --git a/fs/dlm/lowcomms.c b/fs/dlm/lowcomms.c index 0b3109e..ca0c59a 100644 --- a/fs/dlm/lowcomms.c +++ b/fs/dlm/lowcomms.c @@ -52,6 +52,7 @@ #include #include #include +#include #include #include @@ -474,9 +475,6 @@ static void process_sctp_notification(struct connection *con, int prim_len, ret; int addr_len; struct connection *new_con; - sctp_peeloff_arg_t parg; - int parglen = sizeof(parg); - int err; /* * We get this before any data for an association. @@ -525,23 +523,19 @@ static void process_sctp_notification(struct connection *con, return; /* Peel off a new sock */ - parg.associd = sn->sn_assoc_change.sac_assoc_id; - ret = kernel_getsockopt(con->sock, IPPROTO_SCTP, - SCTP_SOCKOPT_PEELOFF, - (void *)&parg, &parglen); + sctp_lock_sock(con->sock->sk); + ret = sctp_do_peeloff(con->sock->sk, + sn->sn_assoc_change.sac_assoc_id, + &new_con->sock); + sctp_release_sock(con->sock->sk); if (ret < 0) { log_print("Can't peel off a socket for " "connection %d to node %d: err=%d", - parg.associd, nodeid, ret); - return; - } - new_con->sock = sockfd_lookup(parg.sd, &err); - if (!new_con->sock) { - log_print("sockfd_lookup error %d", err); + (int)sn->sn_assoc_change.sac_assoc_id, + nodeid, ret); return; } add_sock(new_con->sock, new_con); - sockfd_put(new_con->sock); log_print("connecting to %d sctp association %d", nodeid, (int)sn->sn_assoc_change.sac_assoc_id);