From: ira.weiny@intel.com
To: fstests@vger.kernel.org, Eryu Guan <guaneryu@gmail.com>
Cc: john.hubbard@gmail.com, Dave Chinner <david@fromorbit.com>,
Jan Kara <jack@suse.cz>, Jason Gunthorpe <jgg@ziepe.ca>,
dan.j.williams@intel.com, Jeff Layton <jlayton@kernel.org>,
Ira Weiny <ira.weiny@intel.com>
Subject: [PATCH V2 02/16] src/locktest: Remove OPEN macro
Date: Mon, 23 Sep 2019 10:53:22 -0700 [thread overview]
Message-ID: <20190923175336.2287-3-ira.weiny@intel.com> (raw)
In-Reply-To: <20190923175336.2287-1-ira.weiny@intel.com>
From: Ira Weiny <ira.weiny@intel.com>
The code is much cleaner without this macro. While here add extra debug
output as well.
Reviewed-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Ira Weiny <ira.weiny@intel.com>
---
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
next prev parent reply other threads:[~2019-09-23 17:53 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-23 17:53 [PATCH V2 00/16] Fix locktest and add lease testing to it ira.weiny
2019-09-23 17:53 ` [PATCH V2 01/16] src/locktest: Remove unnecessary sleep ira.weiny
2019-09-23 17:53 ` ira.weiny [this message]
2019-09-23 17:53 ` [PATCH V2 03/16] src/locktest: Change command macro names ira.weiny
2019-09-23 17:53 ` [PATCH V2 04/16] src/locktest: Add get_cmd_str ira.weiny
2019-09-23 17:53 ` [PATCH V2 05/16] src/locktest.c: Clean up client command passing ira.weiny
2019-09-23 17:53 ` [PATCH V2 06/16] src/locktest.c: Fix return code if last test fails ira.weiny
2019-09-23 17:53 ` [PATCH V2 07/16] generic/131: Clean up pid variables ira.weiny
2019-09-23 17:53 ` [PATCH V2 08/16] generic/131: Save stderr for debugging ira.weiny
2019-09-23 17:53 ` [PATCH V2 09/16] src/locktest: Clean up error output ira.weiny
2019-09-23 17:53 ` [PATCH V2 10/16] src/locktest: Audit all debug output ira.weiny
2019-09-23 17:53 ` [PATCH V2 11/16] src/locktest: Add run() function ira.weiny
2019-09-23 17:53 ` [PATCH V2 12/16] src/locktest: Add simple lease testing ira.weiny
2019-09-23 17:53 ` [PATCH V2 13/16] src/locktest: Add lease testing for basic signal reception ira.weiny
2019-09-23 17:53 ` [PATCH V2 14/16] src/locktest: Add truncate lease tests ira.weiny
2019-09-23 17:59 ` [PATCH V2 15/16] common/locktest: Add common locktest functions ira.weiny
2019-09-23 17:59 ` [PATCH V2 16/16] generic/568: Add lease testing ira.weiny
2019-10-01 21:54 ` [PATCH V2 00/16] Fix locktest and add lease testing to it Ira Weiny
2019-10-02 8:24 ` Eryu Guan
2019-10-02 17:59 ` Ira Weiny
-- strict thread matches above, loose matches on Subject: below --
2019-09-23 17:51 ira.weiny
2019-09-23 17:51 ` [PATCH V2 02/16] src/locktest: Remove OPEN macro ira.weiny
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190923175336.2287-3-ira.weiny@intel.com \
--to=ira.weiny@intel.com \
--cc=dan.j.williams@intel.com \
--cc=david@fromorbit.com \
--cc=fstests@vger.kernel.org \
--cc=guaneryu@gmail.com \
--cc=jack@suse.cz \
--cc=jgg@ziepe.ca \
--cc=jlayton@kernel.org \
--cc=john.hubbard@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).