From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga11.intel.com ([192.55.52.93]:18664 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725922AbfIREQF (ORCPT ); Wed, 18 Sep 2019 00:16:05 -0400 From: ira.weiny@intel.com Subject: [PATCH 02/13] src/locktest: Remove OPEN macro Date: Tue, 17 Sep 2019 21:15:47 -0700 Message-Id: <20190918041558.2621-3-ira.weiny@intel.com> In-Reply-To: <20190918041558.2621-1-ira.weiny@intel.com> References: <20190918041558.2621-1-ira.weiny@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: fstests-owner@vger.kernel.org To: fstests@vger.kernel.org, Eryu Guan Cc: john.hubbard@gmail.com, Dave Chinner , Jason Gunthorpe , Jan Kara , dan.j.williams@intel.com, Jeff Layton , Ira Weiny List-ID: From: Ira Weiny The code is much cleaner without this macro. While here add extra debug output as well. Signed-off-by: Ira Weiny --- src/locktest.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/locktest.c b/src/locktest.c index 29e914febdf9..b5e1cf7669d8 100644 --- a/src/locktest.c +++ b/src/locktest.c @@ -61,7 +61,6 @@ extern int h_errno; #define HANDLE int #define INVALID_HANDLE -1 -#define OPEN(N,F) (open(N, F|O_CREAT|O_BINARY, 0644)) #define SEEK(H, O) (lseek(H, O, SEEK_SET)) #define READ(H, B, L) (read(H, B, L)) #define WRITE(H, B, L) (write(H, B, L)) @@ -598,12 +597,16 @@ initialize(HANDLE fd) int do_open(int flag) { - if ((f_fd = OPEN(filename, flag)) == INVALID_HANDLE) { + int flags = flag|O_CREAT|O_BINARY; + + if(debug > 1) + fprintf(stderr, "do_open %s 0x%x\n", filename, flags); + + if ((f_fd = open(filename, flags, 0666)) == INVALID_HANDLE) { perror("shared file create"); return FAIL; /*NOTREACHED*/ } - return PASS; } -- 2.20.1