fsstress: allow afsync on directories too
PATCH 5/7 fsstress: allow afsync on directories too
From: Filipe Manana <[email protected]>
Currently the afsync function can only be performed against regular files. Allow it to operate on directories too, to increase test coverage and allow for chances of finding bugs in the filesystem implementation of fsync against directories.
--- ltp/fsstress.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-)
ltp/fsstress.c +16 -8
@@ -1767,15 +1767,21 @@ afsync_f(int opno, long r)struct iocb iocb;struct iocb *iocbs[] = { &iocb };struct io_event event; +DIR *dir =NULL ;init_pathname (&f); -if (!get_fname (FT_REGFILE , r, &f,NULL ,NULL , &v)) { +if (!get_fname (FT_REGFILE | FT_DIRm, r, &f,NULL ,NULL , &v)) {if (v)printf ("%d/%d: afsync - no filename\n" , procid, opno);free_pathname (&f);return ; } fd =open_path (&f,O_WRONLY |O_DIRECT ); +if (fd <0 && errno ==EISDIR ) { + dir =opendir_path (&f); +if (dir) + fd =dirfd (dir); + } e = fd <0 ? errno :0 ;check_cwd ();if (fd <0 ) {
@@ -1783,6 +1789,8 @@ afsync_f(int opno, long r)printf ("%d/%d: afsync - open %s failed %d\n" , procid, opno, f.path, e);free_pathname (&f); +if (dir) +closedir (dir);return ; }
@@ -1791,24 +1799,24 @@ afsync_f(int opno, long r)if (v)printf ("%d/%d: afsync - io_submit %s %d\n" , procid, opno, f.path, e); -free_pathname (&f); -close (fd); - return; + goto out; }if ((e =io_getevents (io_ctx,1 ,1 , &event,NULL )) !=1 ) {if (v)printf ("%d/%d: afsync - io_getevents failed %d\n" , procid, opno, e); -free_pathname (&f); -close (fd); -return ; + goto out; } e = event.res2;if (v)printf ("%d/%d: afsync %s %d\n" , procid, opno, f.path, e); +out:free_pathname (&f); -close (fd); +if (dir) +closedir (dir); +else +close (fd);#endif }
Signature · 1 line
2.11.0
Quoted 17 lines · On 28.03.19 г. 20:54 ч., [email protected] wrote:
From: Filipe Manana <[email protected]>
Currently the afsync function can only be performed against regular files. Allow it to operate on directories too, to increase test coverage and allow for chances of finding bugs in the filesystem implementation of fsync against directories.
Signed-off-by Filipe Manana <[email protected]>--- ltp/fsstress.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-)ltp/fsstress.c +0
-0
ltp/fsstress.c afsync_f(int opno, long r) · line 1773
Quoted 8 lines
ltp/fsstress.c +2
-1@@ -1767,15 +1767,21 @@ afsync_f(int opno, long r)struct iocb iocb;struct iocb *iocbs[] = { &iocb };struct io_event event; +DIR *dir =NULL ;init_pathname (&f); -if (!get_fname (FT_REGFILE , r, &f,NULL ,NULL , &v)) { +if (!get_fname (FT_REGFILE | FT_DIRm, r, &f,NULL ,NULL , &v)) {
s/FT_DIRm/FT_DIR/
Quoted 56 lines
ltp/fsstress.c +14
-7if (v)printf ("%d/%d: afsync - no filename\n" , procid, opno);free_pathname (&f);return ; } fd =open_path (&f,O_WRONLY |O_DIRECT ); +if (fd <0 && errno ==EISDIR ) { + dir =opendir_path (&f); +if (dir) + fd =dirfd (dir); + } e = fd <0 ? errno :0 ;check_cwd ();if (fd <0 ) {@@ -1783,6 +1789,8 @@ afsync_f(int opno, long r)printf ("%d/%d: afsync - open %s failed %d\n" , procid, opno, f.path, e);free_pathname (&f); +if (dir) +closedir (dir);return ; }@@ -1791,24 +1799,24 @@ afsync_f(int opno, long r)if (v)printf ("%d/%d: afsync - io_submit %s %d\n" , procid, opno, f.path, e); -free_pathname (&f); -close (fd); - return; + goto out; }if ((e =io_getevents (io_ctx,1 ,1 , &event,NULL )) !=1 ) {if (v)printf ("%d/%d: afsync - io_getevents failed %d\n" , procid, opno, e); -free_pathname (&f); -close (fd); -return ; + goto out; } e = event.res2;if (v)printf ("%d/%d: afsync %s %d\n" , procid, opno, f.path, e); +out:free_pathname (&f); -close (fd); +if (dir) +closedir (dir); +else +close (fd);#endif }
Quoted 25 lines · Nikolay Borisov
Quoted 22 lines · On 28.03.19 г. 20:54 ч., [email protected] wrote:
From: Filipe Manana <[email protected]>
Currently the afsync function can only be performed against regular files. Allow it to operate on directories too, to increase test coverage and allow for chances of finding bugs in the filesystem implementation of fsync against directories.
Signed-off-by Filipe Manana <[email protected]>--- ltp/fsstress.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-)ltp/fsstress.c +1
-0@@ -1767,15 +1767,21 @@ afsync_f(int opno, long r)struct iocb iocb;struct iocb *iocbs[] = { &iocb };struct io_event event; +DIR *dir =NULL ;
Quoted 5 lines
ltp/fsstress.c afsync_f(int opno, long r) · line 1773
Quoted 3 lines
ltp/fsstress.c +1
-1init_pathname (&f); -if (!get_fname (FT_REGFILE , r, &f,NULL ,NULL , &v)) { +if (!get_fname (FT_REGFILE | FT_DIRm, r, &f,NULL ,NULL , &v)) {s/FT_DIRm/FT_DIR/
Bummer, FT_DIRm is defined to FT_DIR.... disregard this...
Quoted 58 lines
Quoted 57 lines
ltp/fsstress.c +14
-7if (v)printf ("%d/%d: afsync - no filename\n" , procid, opno);free_pathname (&f);return ; } fd =open_path (&f,O_WRONLY |O_DIRECT ); +if (fd <0 && errno ==EISDIR ) { + dir =opendir_path (&f); +if (dir) + fd =dirfd (dir); + } e = fd <0 ? errno :0 ;check_cwd ();if (fd <0 ) {@@ -1783,6 +1789,8 @@ afsync_f(int opno, long r)printf ("%d/%d: afsync - open %s failed %d\n" , procid, opno, f.path, e);free_pathname (&f); +if (dir) +closedir (dir);return ; }@@ -1791,24 +1799,24 @@ afsync_f(int opno, long r)if (v)printf ("%d/%d: afsync - io_submit %s %d\n" , procid, opno, f.path, e); -free_pathname (&f); -close (fd); - return; + goto out; }if ((e =io_getevents (io_ctx,1 ,1 , &event,NULL )) !=1 ) {if (v)printf ("%d/%d: afsync - io_getevents failed %d\n" , procid, opno, e); -free_pathname (&f); -close (fd); -return ; + goto out; } e = event.res2;if (v)printf ("%d/%d: afsync %s %d\n" , procid, opno, f.path, e); +out:free_pathname (&f); -close (fd); +if (dir) +closedir (dir); +else +close (fd);#endif }
Quoted 26 lines · On Thu, Mar 28, 2019 at 06:54:58PM +0000, [email protected] wrote:
From: Filipe Manana <[email protected]>
Currently the afsync function can only be performed against regular files. Allow it to operate on directories too, to increase test coverage and allow for chances of finding bugs in the filesystem implementation of fsync against directories.
Signed-off-by Filipe Manana <[email protected]>--- ltp/fsstress.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-)ltp/fsstress.c +2
-1@@ -1767,15 +1767,21 @@ afsync_f(int opno, long r)struct iocb iocb;struct iocb *iocbs[] = { &iocb };struct io_event event; +DIR *dir =NULL ;init_pathname (&f); -if (!get_fname (FT_REGFILE , r, &f,NULL ,NULL , &v)) { +if (!get_fname (FT_REGFILE | FT_DIRm, r, &f,NULL ,NULL , &v)) {if (v)
ltp/fsstress.c afsync_f(int opno, long r) · line 1784
Quoted 10 lines
ltp/fsstress.c +5
-0printf ("%d/%d: afsync - no filename\n" , procid, opno);free_pathname (&f);return ; } fd =open_path (&f,O_WRONLY |O_DIRECT ); +if (fd <0 && errno ==EISDIR ) { + dir =opendir_path (&f); +if (dir) + fd =dirfd (dir); + }
You've added this pattern to about 5 functions now. Please factor the whole getname/open thing into a helper that can be used everywhere....
Quoted 31 lines
ltp/fsstress.c +4
-6e = fd <0 ? errno :0 ;check_cwd ();if (fd <0 ) {@@ -1783,6 +1789,8 @@ afsync_f(int opno, long r)printf ("%d/%d: afsync - open %s failed %d\n" , procid, opno, f.path, e);free_pathname (&f); +if (dir) +closedir (dir);return ; }@@ -1791,24 +1799,24 @@ afsync_f(int opno, long r)if (v)printf ("%d/%d: afsync - io_submit %s %d\n" , procid, opno, f.path, e); -free_pathname (&f); -close (fd); -return ; + goto out; }if ((e =io_getevents (io_ctx,1 ,1 , &event,NULL )) !=1 ) {if (v)printf ("%d/%d: afsync - io_getevents failed %d\n" , procid, opno, e); -free_pathname (&f); -close (fd); -return ; + goto out; }
ltp/fsstress.c afsync_f(int opno, long r) · line 1819
Quoted 10 lines
ltp/fsstress.c +5
-1e = event.res2;if (v)printf ("%d/%d: afsync %s %d\n" , procid, opno, f.path, e); +out:free_pathname (&f); -close (fd); +if (dir) +closedir (dir); +else +close (fd);
Same here for close.
Cheers,
Dave.
Signature · 2 lines
Dave Chinner [email protected]