syscalls: avoid creating whiteout device in tests
PATCH 1/1 syscalls: avoid creating whiteout device in tests
A char device with major 0 and minor 0 is known as whiteout device, and overlayfs refuses to create such device. mknod01 and mount02 fail on overlayfs because of this restriction.
Fix it by creating null device instead.
--- testcases/kernel/syscalls/mknod/mknod01.c | 17 +++++++++++++---- testcases/kernel/syscalls/mount/mount02.c | 8 ++++++-- 2 files changed, 19 insertions(+), 6 deletions(-)
testcases/kernel/syscalls/mknod/mknod01.c +13 -4
@@ -66,6 +66,7 @@ int TST_TOTAL = ARRAY_SIZE(tcases);int main (int ac,char **av) {int lc, i; +dev_t dev;tst_parse_opts (ac, av,NULL ,NULL );
@@ -75,17 +76,25 @@ int main(int ac, char **av) tst_count =0 ;for (i =0 ; i <TST_TOTAL ; i++) { +/* +* overlayfs doesn't support mknod char device with +* major 0 and minor 0, which is known as whiteout_dev +*/ +if (S_ISCHR (tcases[i])) + dev =makedev (1 ,3 ); +else + dev =0 ;TEST (mknod (PATH , tcases[i],0 ));if (TEST_RETURN ==-1 ) {tst_resm (TFAIL , -"mknod(%s, %#o, 0) failed, errno=%d : %s" , -PATH , tcases[i],TEST_ERRNO , +"mknod(%s, %#o, %lu) failed, errno=%d : %s" , +PATH , tcases[i], dev,TEST_ERRNO ,strerror (TEST_ERRNO )); }else {tst_resm (TPASS , -"mknod(%s, %#o, 0) returned %ld" , -PATH , tcases[i],TEST_RETURN ); +"mknod(%s, %#o, %lu) returned %ld" , +PATH , tcases[i], dev,TEST_RETURN ); }SAFE_UNLINK (cleanup,PATH );
testcases/kernel/syscalls/mount/mount02.c +6 -2
@@ -170,6 +170,8 @@ static void do_umount(void)static void setup (void ) { +dev_t dev; +tst_sig (FORK ,DEF_HANDLER , cleanup);tst_require_root ();
@@ -190,9 +192,11 @@ static void setup(void)memset (path,'a' ,PATH_MAX +1 ); -if (mknod (char_dev,S_IFCHR |FILE_MODE ,0 )) { + dev =makedev (1 ,3 ); +if (mknod (char_dev,S_IFCHR |FILE_MODE , dev)) {tst_brkm (TBROK |TERRNO , cleanup, -"failed to mknod(char_dev, S_IFCHR | FILE_MODE, 0)" ); +"failed to mknod(char_dev, S_IFCHR | FILE_MODE, %lu)" , + dev); }TEST_PAUSE ;
Signature · 1 line
2.5.0
PATCH 1/1 syscalls: avoid creating whiteout device in tests
----- Original Message -----
Quoted 5 lines
From: "Eryu Guan" <[email protected]>
To: [email protected]
Sent: Thursday, 10 December, 2015 12:38:22 PM
Subject: [LTP] [PATCH] syscalls: avoid creating whiteout device in tests
Quoted 7 lines
A char device with major 0 and minor 0 is known as whiteout device, and overlayfs refuses to create such device. mknod01 and mount02 fail on overlayfs because of this restriction.
Fix it by creating null device instead.
Signed-off-by Eryu Guan <[email protected]>
Hi,
Quoted 21 lines
--- testcases/kernel/syscalls/mknod/mknod01.c | 17 +++++++++++++---- testcases/kernel/syscalls/mount/mount02.c | 8 ++++++-- 2 files changed, 19 insertions(+), 6 deletions(-)testcases/kernel/syscalls/mknod/mknod01.c +1
-0@@ -66,6 +66,7 @@ int TST_TOTAL = ARRAY_SIZE(tcases);int main (int ac,char **av) {int lc, i; +dev_t dev;tst_parse_opts (ac, av,NULL ,NULL );@@ -75,17 +76,25 @@ int main(int ac, char **av) tst_count =0 ;
testcases/kernel/syscalls/mknod/mknod01.c int main(int ac, char **av) · line 87
Quoted 10 lines
testcases/kernel/syscalls/mknod/mknod01.c +8
-0for (i =0 ; i <TST_TOTAL ; i++) { +/* +* overlayfs doesn't support mknod char device with +* major 0 and minor 0, which is known as whiteout_dev +*/ +if (S_ISCHR (tcases[i])) + dev =makedev (1 ,3 ); +else + dev =0 ;TEST (mknod (PATH , tcases[i],0 ));
Did you mean to use "dev" variable here? ----------^^^
The rest looks OK to me.
Regards,
Jan
Quoted 52 lines
testcases/kernel/syscalls/mknod/mknod01.c +4
-4if (TEST_RETURN ==-1 ) {tst_resm (TFAIL , -"mknod(%s, %#o, 0) failed, errno=%d : %s" , -PATH , tcases[i],TEST_ERRNO , +"mknod(%s, %#o, %lu) failed, errno=%d : %s" , +PATH , tcases[i], dev,TEST_ERRNO ,strerror (TEST_ERRNO )); }else {tst_resm (TPASS , -"mknod(%s, %#o, 0) returned %ld" , -PATH , tcases[i],TEST_RETURN ); +"mknod(%s, %#o, %lu) returned %ld" , +PATH , tcases[i], dev,TEST_RETURN ); }SAFE_UNLINK (cleanup,PATH );testcases/kernel/syscalls/mount/mount02.c +6
-3@@ -170,6 +170,8 @@ static void do_umount(void)static void setup (void ) { +dev_t dev; +tst_sig (FORK ,DEF_HANDLER , cleanup);tst_require_root ();@@ -190,9 +192,11 @@ static void setup(void)memset (path,'a' ,PATH_MAX +1 ); -if (mknod (char_dev,S_IFCHR |FILE_MODE ,0 )) { + dev =makedev (1 ,3 ); +if (mknod (char_dev,S_IFCHR |FILE_MODE , dev)) {tst_brkm (TBROK |TERRNO , cleanup, -"failed to mknod(char_dev, S_IFCHR | FILE_MODE, 0)" ); +"failed to mknod(char_dev, S_IFCHR | FILE_MODE, %lu)" , + dev); }TEST_PAUSE ; --2.5.0
--
Mailing list info: http://lists.linux.it/listinfo/ltp
PATCH 1/1 syscalls: avoid creating whiteout device in tests
Quoted 41 lines · Jan Stancek
----- Original Message -----
Quoted 5 lines
From: "Eryu Guan" <[email protected]>
To: [email protected]
Sent: Thursday, 10 December, 2015 12:38:22 PM
Subject: [LTP] [PATCH] syscalls: avoid creating whiteout device in testsQuoted 7 lines
A char device with major 0 and minor 0 is known as whiteout device, and overlayfs refuses to create such device. mknod01 and mount02 fail on overlayfs because of this restriction.
Fix it by creating null device instead.
Signed-off-by Eryu Guan <[email protected]>Hi,
Quoted 21 lines
--- testcases/kernel/syscalls/mknod/mknod01.c | 17 +++++++++++++---- testcases/kernel/syscalls/mount/mount02.c | 8 ++++++-- 2 files changed, 19 insertions(+), 6 deletions(-)testcases/kernel/syscalls/mknod/mknod01.c +1
-0@@ -66,6 +66,7 @@ int TST_TOTAL = ARRAY_SIZE(tcases);int main (int ac,char **av) {int lc, i; +dev_t dev;tst_parse_opts (ac, av,NULL ,NULL );@@ -75,17 +76,25 @@ int main(int ac, char **av) tst_count =0 ;
Quoted 12 lines
testcases/kernel/syscalls/mknod/mknod01.c int main(int ac, char **av) · line 87
Quoted 10 lines
testcases/kernel/syscalls/mknod/mknod01.c +8
-0for (i =0 ; i <TST_TOTAL ; i++) { +/* +* overlayfs doesn't support mknod char device with +* major 0 and minor 0, which is known as whiteout_dev +*/ +if (S_ISCHR (tcases[i])) + dev =makedev (1 ,3 ); +else + dev =0 ;TEST (mknod (PATH , tcases[i],0 ));Did you mean to use "dev" variable here? ----------^^^
Thanks for the review! Yes, it should be "dev", will send v2 shortly. (I should generate patch on my test machine, where I test the code, not on my laptop..)
Thanks,
Eryu
PATCH v2 1/1 syscalls: avoid creating whiteout device in tests
In reply to Eryu GuanA char device with major 0 and minor 0 is known as whiteout device, and overlayfs refuses to create such device. mknod01 and mount02 fail on overlayfs because of this restriction.
Fix it by creating null device instead.
---
v2:
- update the arg in mknod syscall to really use variable "dev", which is the whole point of this patch
testcases/kernel/syscalls/mknod/mknod01.c | 19 ++++++++++++++----- testcases/kernel/syscalls/mount/mount02.c | 8 ++++++-- 2 files changed, 20 insertions(+), 7 deletions(-)
testcases/kernel/syscalls/mknod/mknod01.c +14 -5
@@ -66,6 +66,7 @@ int TST_TOTAL = ARRAY_SIZE(tcases);int main (int ac,char **av) {int lc, i; +dev_t dev;tst_parse_opts (ac, av,NULL ,NULL );
@@ -75,17 +76,25 @@ int main(int ac, char **av) tst_count =0 ;for (i =0 ; i <TST_TOTAL ; i++) { -TEST (mknod (PATH , tcases[i],0 )); +/* +* overlayfs doesn't support mknod char device with +* major 0 and minor 0, which is known as whiteout_dev +*/ +if (S_ISCHR (tcases[i])) + dev =makedev (1 ,3 ); +else + dev =0 ; +TEST (mknod (PATH , tcases[i], dev));if (TEST_RETURN ==-1 ) {tst_resm (TFAIL , -"mknod(%s, %#o, 0) failed, errno=%d : %s" , -PATH , tcases[i],TEST_ERRNO , +"mknod(%s, %#o, %lu) failed, errno=%d : %s" , +PATH , tcases[i], dev,TEST_ERRNO ,strerror (TEST_ERRNO )); }else {tst_resm (TPASS , -"mknod(%s, %#o, 0) returned %ld" , -PATH , tcases[i],TEST_RETURN ); +"mknod(%s, %#o, %lu) returned %ld" , +PATH , tcases[i], dev,TEST_RETURN ); }SAFE_UNLINK (cleanup,PATH );
testcases/kernel/syscalls/mount/mount02.c +6 -2
@@ -170,6 +170,8 @@ static void do_umount(void)static void setup (void ) { +dev_t dev; +tst_sig (FORK ,DEF_HANDLER , cleanup);tst_require_root ();
@@ -190,9 +192,11 @@ static void setup(void)memset (path,'a' ,PATH_MAX +1 ); -if (mknod (char_dev,S_IFCHR |FILE_MODE ,0 )) { + dev =makedev (1 ,3 ); +if (mknod (char_dev,S_IFCHR |FILE_MODE , dev)) {tst_brkm (TBROK |TERRNO , cleanup, -"failed to mknod(char_dev, S_IFCHR | FILE_MODE, 0)" ); +"failed to mknod(char_dev, S_IFCHR | FILE_MODE, %lu)" , + dev); }TEST_PAUSE ;
Signature · 1 line
2.5.0
PATCH v2 1/1 syscalls: avoid creating whiteout device in tests
----- Original Message -----
Quoted 9 lines
From: "Eryu Guan" <[email protected]>
To: [email protected]
Sent: Friday, 11 December, 2015 2:24:23 PM
Subject: [LTP] [PATCH v2] syscalls: avoid creating whiteout device in testsA char device with major 0 and minor 0 is known as whiteout device, and overlayfs refuses to create such device. mknod01 and mount02 fail on overlayfs because of this restriction.
Quoted 8 lines
Fix it by creating null device instead.
Signed-off-by Eryu Guan <[email protected]>---
v2:
- update the arg in mknod syscall to really use variable "dev", which is the whole point of this patch
Pushed with reference to Documentation about whiteout device.
Regards,
Jan
Quoted 84 lines
testcases/kernel/syscalls/mknod/mknod01.c | 19 ++++++++++++++----- testcases/kernel/syscalls/mount/mount02.c | 8 ++++++-- 2 files changed, 20 insertions(+), 7 deletions(-)testcases/kernel/syscalls/mknod/mknod01.c +14
-5@@ -66,6 +66,7 @@ int TST_TOTAL = ARRAY_SIZE(tcases);int main (int ac,char **av) {int lc, i; +dev_t dev;tst_parse_opts (ac, av,NULL ,NULL );@@ -75,17 +76,25 @@ int main(int ac, char **av) tst_count =0 ;for (i =0 ; i <TST_TOTAL ; i++) { -TEST (mknod (PATH , tcases[i],0 )); +/* +* overlayfs doesn't support mknod char device with +* major 0 and minor 0, which is known as whiteout_dev +*/ +if (S_ISCHR (tcases[i])) + dev =makedev (1 ,3 ); +else + dev =0 ; +TEST (mknod (PATH , tcases[i], dev));if (TEST_RETURN ==-1 ) {tst_resm (TFAIL , -"mknod(%s, %#o, 0) failed, errno=%d : %s" , -PATH , tcases[i],TEST_ERRNO , +"mknod(%s, %#o, %lu) failed, errno=%d : %s" , +PATH , tcases[i], dev,TEST_ERRNO ,strerror (TEST_ERRNO )); }else {tst_resm (TPASS , -"mknod(%s, %#o, 0) returned %ld" , -PATH , tcases[i],TEST_RETURN ); +"mknod(%s, %#o, %lu) returned %ld" , +PATH , tcases[i], dev,TEST_RETURN ); }SAFE_UNLINK (cleanup,PATH );testcases/kernel/syscalls/mount/mount02.c +6
-3@@ -170,6 +170,8 @@ static void do_umount(void)static void setup (void ) { +dev_t dev; +tst_sig (FORK ,DEF_HANDLER , cleanup);tst_require_root ();@@ -190,9 +192,11 @@ static void setup(void)memset (path,'a' ,PATH_MAX +1 ); -if (mknod (char_dev,S_IFCHR |FILE_MODE ,0 )) { + dev =makedev (1 ,3 ); +if (mknod (char_dev,S_IFCHR |FILE_MODE , dev)) {tst_brkm (TBROK |TERRNO , cleanup, -"failed to mknod(char_dev, S_IFCHR | FILE_MODE, 0)" ); +"failed to mknod(char_dev, S_IFCHR | FILE_MODE, %lu)" , + dev); }TEST_PAUSE ; --2.5.0
--
Mailing list info: http://lists.linux.it/listinfo/ltp