Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932185AbXJSRUf (ORCPT ); Fri, 19 Oct 2007 13:20:35 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1763744AbXJSRTu (ORCPT ); Fri, 19 Oct 2007 13:19:50 -0400 Received: from mtagate6.de.ibm.com ([195.212.29.155]:31411 "EHLO mtagate6.de.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755745AbXJSRTr (ORCPT ); Fri, 19 Oct 2007 13:19:47 -0400 Message-Id: <20071019171944.566891659@de.ibm.com> References: <20071019171857.430999834@de.ibm.com> User-Agent: quilt/0.46-1 Date: Fri, 19 Oct 2007 19:19:01 +0200 From: Martin Schwidefsky To: linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org Cc: Cornelia Huck , Martin Schwidefsky Subject: [patch 04/10] cio: Fix incomplete commit for uevent suppression. Content-Disposition: inline; filename=004-cio-uevent.diff Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1733 Lines: 47 From: Cornelia Huck Commit fa1a8c23eb7d3ded8a3c6d0e653339a2bc7fca9e intended to introduce uevent suppression for subchannels, but half of it was lost somewhere. Now, we end up with two uevents for every registered subchannel :( So we should better add the missing part from http://marc.info/?l=linux-kernel&m=117515953113974&w=2. Signed-off-by: Cornelia Huck Signed-off-by: Martin Schwidefsky --- drivers/s390/cio/css.c | 9 +++++++++ 1 file changed, 9 insertions(+) Index: quilt-2.6/drivers/s390/cio/css.c =================================================================== --- quilt-2.6.orig/drivers/s390/cio/css.c +++ quilt-2.6/drivers/s390/cio/css.c @@ -182,6 +182,15 @@ static int css_register_subchannel(struc sch->dev.bus = &css_bus_type; sch->dev.release = &css_subchannel_release; sch->dev.groups = subch_attr_groups; + /* + * We don't want to generate uevents for I/O subchannels that don't + * have a working ccw device behind them since they will be + * unregistered before they can be used anyway, so we delay the add + * uevent until after device recognition was successful. + */ + if (!cio_is_console(sch->schid)) + /* Console is special, no need to suppress. */ + sch->dev.uevent_suppress = 1; css_update_ssd_info(sch); /* make it known to the system */ ret = css_sch_device_register(sch); -- blue skies, Martin. "Reality continues to ruin my life." - Calvin. - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/