mirror of
https://github.com/linux-apfs/apfstests.git
synced 2026-05-01 15:01:44 -07:00
locktest: set f_fd to INVALID_HANDLE on close
Ensure that the fd is marked invalid after close. Also, the "closed" and "reopen" variables are always set to 0. Remove them. Signed-off-by: Jeff Layton <jlayton@poochiereds.net> Reviewed-by: Dave Chinner <dchinner@redhat.com> Signed-off-by: Dave Chinner <david@fromorbit.com>
This commit is contained in:
committed by
Dave Chinner
parent
2baab36b59
commit
ece564a735
+3
-7
@@ -96,8 +96,6 @@ static int debug = 0;
|
||||
static int server = 1;
|
||||
static int maxio = 8192;
|
||||
static int port = 7890;
|
||||
static int reopen=0;
|
||||
static int closed=0;
|
||||
static int testnumber = -1;
|
||||
static int saved_errno = 0;
|
||||
|
||||
@@ -615,13 +613,10 @@ int do_open(int flag)
|
||||
{
|
||||
if ((f_fd = OPEN(filename, flag)) == INVALID_HANDLE) {
|
||||
perror("shared file create");
|
||||
closed = 0;
|
||||
return FAIL;
|
||||
/*NOTREACHED*/
|
||||
}
|
||||
|
||||
closed = 0;
|
||||
|
||||
#ifdef __sun
|
||||
if (D_flag) {
|
||||
directio(f_fd, DIRECTIO_ON);
|
||||
@@ -701,12 +696,13 @@ int do_close(void)
|
||||
|
||||
errno =0;
|
||||
CLOSE(f_fd);
|
||||
f_fd = INVALID_HANDLE;
|
||||
|
||||
saved_errno = errno;
|
||||
|
||||
if (errno)
|
||||
return FAIL;
|
||||
return(PASS);
|
||||
return PASS;
|
||||
}
|
||||
|
||||
void
|
||||
@@ -778,7 +774,7 @@ void recv_ctl(void)
|
||||
void
|
||||
cleanup(void)
|
||||
{
|
||||
if (f_fd>=0 && !reopen && !closed)
|
||||
if (f_fd>=0)
|
||||
CLOSE(f_fd);
|
||||
|
||||
if (c_fd>=0)
|
||||
|
||||
Reference in New Issue
Block a user