Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753741AbbFVWxw (ORCPT ); Mon, 22 Jun 2015 18:53:52 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:36291 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751900AbbFVWxo (ORCPT ); Mon, 22 Jun 2015 18:53:44 -0400 Date: Mon, 22 Jun 2015 15:53:21 -0700 From: Greg KH To: Lukasz Skalski Cc: daniel@zonque.org, dh.herrmann@gmail.com, tixxdz@opendz.org, sergei@s15v.net, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2] kdbus: do not append the same connection to the queue twice Message-ID: <20150622225321.GA5702@kroah.com> References: <1428999893-6062-1-git-send-email-l.skalski@samsung.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1428999893-6062-1-git-send-email-l.skalski@samsung.com> User-Agent: Mutt/1.5.23+89 (0255b37be491) (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1559 Lines: 52 On Tue, Apr 14, 2015 at 10:24:53AM +0200, Lukasz Skalski wrote: > As it was discussed on systemd ML [1], the same connection should be > queued up only once for a given well-known name. > > [1] http://lists.freedesktop.org/archives/systemd-devel/2015-April/030494.html > > Signed-off-by: Lukasz Skalski > > diff --git a/ipc/kdbus/names.c b/ipc/kdbus/names.c > index 657008e..df99e4d 100644 > --- a/ipc/kdbus/names.c > +++ b/ipc/kdbus/names.c > @@ -353,10 +353,24 @@ int kdbus_name_acquire(struct kdbus_name_registry *reg, > } else if (flags & KDBUS_NAME_QUEUE) { > /* add to waiting-queue of the name */ > > - ret = kdbus_name_pending_new(e, conn, flags); > - if (ret >= 0) > - /* tell the caller that we queued it */ > - rflags |= KDBUS_NAME_IN_QUEUE; > + struct kdbus_name_pending *p; > + bool in_queue = false; > + > + list_for_each_entry(p, &e->queue, name_entry) { > + if (p->conn == conn) { > + /* connection is already queued */ > + rflags |= KDBUS_NAME_IN_QUEUE; > + in_queue = true; > + break; > + } > + } > + > + if (!in_queue) { > + ret = kdbus_name_pending_new(e, conn, flags); > + if (ret >= 0) > + /* tell the caller that we queued it */ > + rflags |= KDBUS_NAME_IN_QUEUE; > + } > } else { > /* the name is busy, return a failure */ > ret = -EEXIST; > -- > 1.9.3 David, what happened with this, should it be applied? thanks, greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in Please read the FAQ at http://www.tux.org/lkml/