From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.6 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1D964C433EF for ; Thu, 16 Sep 2021 02:19:35 +0000 (UTC) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A46DA60F4A for ; Thu, 16 Sep 2021 02:19:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org A46DA60F4A Authentication-Results: mail.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1631758773; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=MD8wSs5WYPKlbL2kE2Oj5QO0jBXRQf0bu7BgeE8hX3s=; b=fjTeddddaBDUOWiaDbAAsIxP5qki3+pHKU76kaqUECL925LJmSWftWW3cnMFFJZCoENpyx /63mraRehhEbovzvOIPlWavnTyzEcX+7XNiPhKfWIEPU6ciixTcY4VhFQW+NQ5dRiyC85m yp/MCqSYYju9zCKYK25Jet2sQ1hH1CQ= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-549-2nquKgWJPQec8qrCTgj1yQ-1; Wed, 15 Sep 2021 22:19:32 -0400 X-MC-Unique: 2nquKgWJPQec8qrCTgj1yQ-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1B572362F9; Thu, 16 Sep 2021 02:19:28 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 02EFE604CC; Thu, 16 Sep 2021 02:19:28 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id CE9884E590; Thu, 16 Sep 2021 02:19:27 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 18G2JQ6U027809 for ; Wed, 15 Sep 2021 22:19:26 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3F17960C82; Thu, 16 Sep 2021 02:19:26 +0000 (UTC) Received: from octiron.msp.redhat.com (unknown [10.15.80.209]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6085060240; Thu, 16 Sep 2021 02:19:23 +0000 (UTC) Received: from octiron.msp.redhat.com (localhost.localdomain [127.0.0.1]) by octiron.msp.redhat.com (8.14.9/8.14.9) with ESMTP id 18G2JLib007357; Wed, 15 Sep 2021 21:19:21 -0500 Received: (from bmarzins@localhost) by octiron.msp.redhat.com (8.14.9/8.14.9/Submit) id 18G2JKhj007356; Wed, 15 Sep 2021 21:19:20 -0500 Date: Wed, 15 Sep 2021 21:19:20 -0500 From: Benjamin Marzinski To: mwilck@suse.com Message-ID: <20210916021920.GF3087@octiron.msp.redhat.com> References: <20210910114120.13665-1-mwilck@suse.com> <20210910114120.13665-21-mwilck@suse.com> MIME-Version: 1.0 In-Reply-To: <20210910114120.13665-21-mwilck@suse.com> User-Agent: Mutt/1.5.23 (2014-03-12) X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: dm-devel@redhat.com Cc: lixiaokeng@huawei.com, dm-devel@redhat.com, Chongyun Wu Subject: Re: [dm-devel] [PATCH 20/35] multipathd: move uxsock_trigger() to uxlsnr.c X-BeenThere: dm-devel@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: device-mapper development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=dm-devel-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit On Fri, Sep 10, 2021 at 01:41:05PM +0200, mwilck@suse.com wrote: > From: Martin Wilck > > uxsock_trigger() really belongs into cli.c. I suppose that way back in > the past there were strong reasons to call this function via a > pointer. I don't think these reasons are valid any more. Moving > the function to cli.c allows restructuring the code. > > No functional changes. > Reviewed-by: Benjamin Marzinski > Signed-off-by: Martin Wilck > --- > multipathd/main.c | 44 +------------------------------------------- > multipathd/uxlsnr.c | 44 ++++++++++++++++++++++++++++++++++++++++++-- > multipathd/uxlsnr.h | 4 +--- > 3 files changed, 44 insertions(+), 48 deletions(-) > > diff --git a/multipathd/main.c b/multipathd/main.c > index c6357ef..ec4bcc3 100644 > --- a/multipathd/main.c > +++ b/multipathd/main.c > @@ -1526,48 +1526,6 @@ map_discovery (struct vectors * vecs) > return 0; > } > > -int > -uxsock_trigger (char * str, char ** reply, int * len, bool is_root, > - void * trigger_data) > -{ > - struct vectors * vecs; > - int r; > - > - *reply = NULL; > - *len = 0; > - vecs = (struct vectors *)trigger_data; > - > - if ((str != NULL) && (is_root == false) && > - (strncmp(str, "list", strlen("list")) != 0) && > - (strncmp(str, "show", strlen("show")) != 0)) { > - *reply = STRDUP("permission deny: need to be root"); > - if (*reply) > - *len = strlen(*reply) + 1; > - return 1; > - } > - > - r = parse_cmd(str, reply, len, vecs, uxsock_timeout / 1000); > - > - if (r > 0) { > - if (r == ETIMEDOUT) > - *reply = STRDUP("timeout\n"); > - else > - *reply = STRDUP("fail\n"); > - if (*reply) > - *len = strlen(*reply) + 1; > - r = 1; > - } > - else if (!r && *len == 0) { > - *reply = STRDUP("ok\n"); > - if (*reply) > - *len = strlen(*reply) + 1; > - r = 0; > - } > - /* else if (r < 0) leave *reply alone */ > - > - return r; > -} > - > int > uev_trigger (struct uevent * uev, void * trigger_data) > { > @@ -1704,7 +1662,7 @@ uxlsnrloop (void * ap) > == DAEMON_CONFIGURE) > handle_signals(false); > > - uxsock_listen(&uxsock_trigger, ux_sock, ap); > + uxsock_listen(ux_sock, ap); > > out_sock: > pthread_cleanup_pop(1); /* uxsock_cleanup */ > diff --git a/multipathd/uxlsnr.c b/multipathd/uxlsnr.c > index e701a1c..622aac1 100644 > --- a/multipathd/uxlsnr.c > +++ b/multipathd/uxlsnr.c > @@ -311,11 +311,51 @@ static void handle_inotify(int fd, struct watch_descriptors *wds) > condlog(1, "Multipath configuration updated.\nReload multipathd for changes to take effect"); > } > > +static int uxsock_trigger(char *str, char **reply, int *len, > + bool is_root, void *trigger_data) > +{ > + struct vectors * vecs; > + int r; > + > + *reply = NULL; > + *len = 0; > + vecs = (struct vectors *)trigger_data; > + > + if ((str != NULL) && (is_root == false) && > + (strncmp(str, "list", strlen("list")) != 0) && > + (strncmp(str, "show", strlen("show")) != 0)) { > + *reply = STRDUP("permission deny: need to be root"); > + if (*reply) > + *len = strlen(*reply) + 1; > + return 1; > + } > + > + r = parse_cmd(str, reply, len, vecs, uxsock_timeout / 1000); > + > + if (r > 0) { > + if (r == ETIMEDOUT) > + *reply = STRDUP("timeout\n"); > + else > + *reply = STRDUP("fail\n"); > + if (*reply) > + *len = strlen(*reply) + 1; > + r = 1; > + } > + else if (!r && *len == 0) { > + *reply = STRDUP("ok\n"); > + if (*reply) > + *len = strlen(*reply) + 1; > + r = 0; > + } > + /* else if (r < 0) leave *reply alone */ > + > + return r; > +} > + > /* > * entry point > */ > -void * uxsock_listen(uxsock_trigger_fn uxsock_trigger, long ux_sock, > - void * trigger_data) > +void *uxsock_listen(long ux_sock, void *trigger_data) > { > int rlen; > char *inbuf; > diff --git a/multipathd/uxlsnr.h b/multipathd/uxlsnr.h > index 18f008d..60c3a2c 100644 > --- a/multipathd/uxlsnr.h > +++ b/multipathd/uxlsnr.h > @@ -3,10 +3,8 @@ > > #include > > -typedef int (uxsock_trigger_fn)(char *, char **, int *, bool, void *); > - > void uxsock_cleanup(void *arg); > -void *uxsock_listen(uxsock_trigger_fn uxsock_trigger, long ux_sock, > +void *uxsock_listen(long ux_sock, > void * trigger_data); > > #endif > -- > 2.33.0 -- dm-devel mailing list dm-devel@redhat.com https://listman.redhat.com/mailman/listinfo/dm-devel