From patchwork Mon Sep 23 17:51:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ira Weiny X-Patchwork-Id: 11157425 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 BD5C414ED for ; Mon, 23 Sep 2019 17:52:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A4E2020882 for ; Mon, 23 Sep 2019 17:52:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2440203AbfIWRwP (ORCPT ); Mon, 23 Sep 2019 13:52:15 -0400 Received: from mga06.intel.com ([134.134.136.31]:32789 "EHLO mga06.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2440202AbfIWRwP (ORCPT ); Mon, 23 Sep 2019 13:52:15 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 23 Sep 2019 10:52:14 -0700 X-IronPort-AV: E=Sophos;i="5.64,541,1559545200"; d="scan'208";a="272361104" Received: from iweiny-desk2.sc.intel.com (HELO localhost) ([10.3.52.157]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 23 Sep 2019 10:52:14 -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 05/16] src/locktest.c: Clean up client command passing Date: Mon, 23 Sep 2019 10:51:53 -0700 Message-Id: <20190923175204.2139-6-ira.weiny@intel.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190923175204.2139-1-ira.weiny@intel.com> References: <20190923175204.2139-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 The client was using the test index rather than the values being passed to it for a command. While this technically worked it is cleaner to fully initialize the command message and use the values in that message. Reviewed-by: Jeff Layton Signed-off-by: Ira Weiny --- src/locktest.c | 36 +++++++++++++++++++++++------------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/src/locktest.c b/src/locktest.c index 825d9df3ddf8..3abb91120144 100644 --- a/src/locktest.c +++ b/src/locktest.c @@ -670,6 +670,17 @@ int do_close(void) return PASS; } +static void init_ctl(int32_t index) +{ + ctl.test= (int32_t)tests[index][TEST_NUM]; + ctl.command = (int32_t)tests[index][COMMAND]; + ctl.offset = tests[index][OFFSET]; + ctl.length = tests[index][LENGTH]; + ctl.index = index; + ctl.result = (int32_t)tests[index][RESULT]; + ctl.error = 0; +} + void send_ctl(void) { @@ -1018,6 +1029,8 @@ main(int argc, char *argv[]) ctl.test = 0; end=1; } + /* get the client to do something */ + init_ctl(index); if(debug > 1) fprintf(stderr, "Sending command to client (%d) - %s - %lld:%lld\n", index, @@ -1074,20 +1087,16 @@ main(int argc, char *argv[]) end = 1; break; } - - ctl.command = tests[index][COMMAND]; - ctl.offset = tests[index][OFFSET]; - ctl.length = tests[index][LENGTH]; - switch(tests[index][COMMAND]) { + switch(ctl.command) { case CMD_WRLOCK: - result = do_lock(F_SETLK, F_WRLCK, tests[index][OFFSET], tests[index][LENGTH]); + result = do_lock(F_SETLK, F_WRLCK, ctl.offset, ctl.length); break; case CMD_RDLOCK: - result = do_lock(F_SETLK, F_RDLCK, tests[index][OFFSET], tests[index][LENGTH]); + result = do_lock(F_SETLK, F_RDLCK, ctl.offset, ctl.length); break; case CMD_UNLOCK: - result = do_lock(F_SETLK, F_UNLCK, tests[index][OFFSET], tests[index][LENGTH]); + result = do_lock(F_SETLK, F_UNLCK, ctl.offset, ctl.length); break; case CMD_CLOSE: result = do_close(); @@ -1096,21 +1105,22 @@ main(int argc, char *argv[]) result = do_open(tests[index][FLAGS]); break; case CMD_WRTEST: - result = do_lock(F_GETLK, F_WRLCK, tests[index][OFFSET], tests[index][LENGTH]); + result = do_lock(F_GETLK, F_WRLCK, ctl.offset, ctl.length); break; case CMD_RDTEST: - result = do_lock(F_GETLK, F_RDLCK, tests[index][OFFSET], tests[index][LENGTH]); + result = do_lock(F_GETLK, F_RDLCK, ctl.offset, ctl.length); break; } - if( result != tests[index][RESULT] ) { + if( result != ctl.result ) { if(debug) - fprintf(stderr,"Got %d, wanted %lld\n", result, - (long long)tests[index][RESULT]); + fprintf(stderr,"Got %d, wanted %d\n", + result, ctl.result); ctl.result = FAIL; ctl.error = saved_errno; fail_count++; } else { ctl.result = PASS; + ctl.error = 0; } if(debug > 2) fprintf(stderr,"client: sending result to server (%d)\n", ctl.index);