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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 CE511C3A5A8 for ; Wed, 4 Sep 2019 18:23:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9CAA220870 for ; Wed, 4 Sep 2019 18:23:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567621416; bh=Ux6mz4S4+0g54ti7S6WbeadakibflhW2g4qi+dAYFIY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=GPk5/VxGvVQDPufTE5uaxWABmbv++ihLuNs/UQYab5MJ1M2zMCpXpHBvTnKxxx9zy PYgAoaoh+LBAkTyL1KYEmJovXS0dtfOmqN8q7UWLmF2A8pUAxwwmWKkyHjOEm6dhhn D6e0o8hnZNapkHAvhZ6g2OAX5D7rNujY9qzD9zLI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388789AbfIDSCj (ORCPT ); Wed, 4 Sep 2019 14:02:39 -0400 Received: from mail.kernel.org ([198.145.29.99]:42646 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388061AbfIDSCg (ORCPT ); Wed, 4 Sep 2019 14:02:36 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 57610208E4; Wed, 4 Sep 2019 18:02:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567620155; bh=Ux6mz4S4+0g54ti7S6WbeadakibflhW2g4qi+dAYFIY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ji0ybStQnxuZGOa+HJ+rU4w5pPf3RaDezsieGq3rjpMAHzLdmtVgNxMMXo/7tmTJG 4OaxVRdm+fIjL/xYova5jU4vv6XBrl53twLDjKCfvdpdDsxNiJkRzf4AvwX8gVuKqg 3/jG4Jt8oX4vtZ5n9CTU1ouZbfIQ1jESUOID1KHA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Adrian Vladu , "K. Y. Srinivasan" , Haiyang Zhang , Stephen Hemminger , Sasha Levin , Alessandro Pilotti Subject: [PATCH 4.14 11/57] tools: hv: fix KVP and VSS daemons exit code Date: Wed, 4 Sep 2019 19:53:39 +0200 Message-Id: <20190904175303.028531986@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190904175301.777414715@linuxfoundation.org> References: <20190904175301.777414715@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org [ Upstream commit b0995156071b0ff29a5902964a9dc8cfad6f81c0 ] HyperV KVP and VSS daemons should exit with 0 when the '--help' or '-h' flags are used. Signed-off-by: Adrian Vladu Cc: "K. Y. Srinivasan" Cc: Haiyang Zhang Cc: Stephen Hemminger Cc: Sasha Levin Cc: Alessandro Pilotti Signed-off-by: Sasha Levin --- tools/hv/hv_kvp_daemon.c | 2 ++ tools/hv/hv_vss_daemon.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/tools/hv/hv_kvp_daemon.c b/tools/hv/hv_kvp_daemon.c index 62c9a503ae052..0ef215061fb50 100644 --- a/tools/hv/hv_kvp_daemon.c +++ b/tools/hv/hv_kvp_daemon.c @@ -1380,6 +1380,8 @@ int main(int argc, char *argv[]) daemonize = 0; break; case 'h': + print_usage(argv); + exit(0); default: print_usage(argv); exit(EXIT_FAILURE); diff --git a/tools/hv/hv_vss_daemon.c b/tools/hv/hv_vss_daemon.c index 34031a297f024..514d29966ac67 100644 --- a/tools/hv/hv_vss_daemon.c +++ b/tools/hv/hv_vss_daemon.c @@ -172,6 +172,8 @@ int main(int argc, char *argv[]) daemonize = 0; break; case 'h': + print_usage(argv); + exit(0); default: print_usage(argv); exit(EXIT_FAILURE); -- 2.20.1