From patchwork Mon Sep 23 17:53:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ira Weiny X-Patchwork-Id: 11157453 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id AECC8912 for ; Mon, 23 Sep 2019 17:53:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8C98120882 for ; Mon, 23 Sep 2019 17:53:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2502232AbfIWRxp (ORCPT ); Mon, 23 Sep 2019 13:53:45 -0400 Received: from mga05.intel.com ([192.55.52.43]:53958 "EHLO mga05.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2394221AbfIWRxp (ORCPT ); Mon, 23 Sep 2019 13:53:45 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 23 Sep 2019 10:53:44 -0700 X-IronPort-AV: E=Sophos;i="5.64,541,1559545200"; d="scan'208";a="200618254" Received: from iweiny-desk2.sc.intel.com (HELO localhost) ([10.3.52.157]) by orsmga002-auth.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 23 Sep 2019 10:53:44 -0700 From: ira.weiny@intel.com To: fstests@vger.kernel.org, Eryu Guan Cc: john.hubbard@gmail.com, Dave Chinner , Jan Kara , Jason Gunthorpe , dan.j.williams@intel.com, Jeff Layton , Ira Weiny Subject: [PATCH V2 07/16] generic/131: Clean up pid variables Date: Mon, 23 Sep 2019 10:53:27 -0700 Message-Id: <20190923175336.2287-8-ira.weiny@intel.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190923175336.2287-1-ira.weiny@intel.com> References: <20190923175336.2287-1-ira.weiny@intel.com> MIME-Version: 1.0 Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org From: Ira Weiny Change the name of the variables to reflect the client vs server. This will help in future patches. Reviewed-by: Jeff Layton Signed-off-by: Ira Weiny --- tests/generic/131 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/generic/131 b/tests/generic/131 index e8cdd48e8667..c333e676e8f9 100755 --- a/tests/generic/131 +++ b/tests/generic/131 @@ -17,8 +17,8 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _cleanup() { - kill $locktest_pid2 > /dev/null 2>&1 - kill $locktest_pid1 > /dev/null 2>&1 + kill $client_pid > /dev/null 2>&1 + kill $server_pid > /dev/null 2>&1 } # get standard environment, filters and checks @@ -38,7 +38,7 @@ touch $TEST_DIR/server.out # Start the server src/locktest $TESTFILE 2>&1 > $TEST_DIR/server.out & -locktest_pid1=$! +server_pid=$! timeout=30 while [ $timeout -gt 0 ]; do @@ -50,7 +50,7 @@ while [ $timeout -gt 0 ]; do fi # check the existence of server process - if ! kill -s 0 $locktest_pid1 >/dev/null 2>&1; then + if ! kill -s 0 $server_pid >/dev/null 2>&1; then echo "Server died abnormally" exit 1 fi @@ -65,7 +65,7 @@ fi # Start the client src/locktest -p $PORT -h localhost $TESTFILE 2>&1 > $TEST_DIR/client.out -locktest_pid2=$! +client_pid=$! result=$? if [ $result -eq 0 ]; then echo success!