safe_macros.c: Fix missing ro flag for FUSE NTFS mounts
PATCH v2 1/1 safe_macros.c: Fix missing ro flag for FUSE NTFS mounts
The test incorrectly assumes that NTFS mounts are read-only, but the mount command does not explicitly set the read-only flag. As a result, the test fails when checking sb_flags against MS_RDONLY.
Old behavior:
sudo LTP_SINGLE_FS_TYPE=ntfs strace -e trace=mount,statmount -o log.log -s 128 -f ./statmount02
...
statmount02.c:47: TFAIL: st_mount->sb_flags (0) != MS_RDONLY (1)
...Relevant log excerpt:
3890601 mount("/dev/zero", "/tmp/mountBDSEqk", "ntfs", 0, NULL) = -1 ENOTBLK (Block device required)
3890608 mount("/dev/loop0", "/tmp/LTP_staTPRruR/mntpoint", "fuseblk", 0, "allow_other,blksize=4096,fd=4,rootmode=40000,user_id=0,group_id=0") = 0
3890607 statmount({size=24, mnt_id=0x80010957, param=STATMOUNT_SB_BASIC}, {size=512, mask=STATMOUNT_SB_BASIC, sb_dev_major=7, sb_dev_minor=0, sb_magic=FUSE_SUPER_MAGIC, sb_flags=0}, 512, 0) = 0---
Change since v1 (Thanks Cyril & thanks for the ping):
* Removed restriction for NTFS.
lib/safe_macros.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
lib/safe_macros.c +7 -2
@@ -942,10 +942,15 @@ int safe_mount(const char *file, const int lineno, void (*cleanup_fn)(void),*/ if (possibly_fuse (filesystemtype)) {char buf[1024 ]; +const char * mount_fmt;tst_resm_ (file, lineno,TINFO ,"Trying FUSE..." ); -snprintf (buf,sizeof (buf),"mount.%s '%s' '%s'" , - filesystemtype, source, target); +if (mountflags ==MS_RDONLY ) + mount_fmt ="mount.%s -o ro '%s' '%s'" ; +else + mount_fmt ="mount.%s '%s' '%s'" ; +snprintf (buf,sizeof (buf), mount_fmt, filesystemtype, + source, target); rval =tst_system (buf);if (WIFEXITED (rval) &&WEXITSTATUS (rval) ==0 )
--
2.50.1
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
Hi,
nit: maybe the patch title also should not mention NTFS.
-
Avinesh
Quoted 53 lines · CEST Jan Polensky
The test incorrectly assumes that NTFS mounts are read-only, but the mount command does not explicitly set the read-only flag. As a result, the test fails when checking
sb_flagsagainstMS_RDONLY.Old behavior:
sudo LTP_SINGLE_FS_TYPE=ntfs strace -e trace=mount,statmount -o log.log -s 128 -f ./statmount02 ... statmount02.c:47: TFAIL: st_mount->sb_flags (0) != MS_RDONLY (1) ...Relevant log excerpt:
3890601 mount("/dev/zero", "/tmp/mountBDSEqk", "ntfs", 0, NULL) = -1 ENOTBLK (Block device required) 3890608 mount("/dev/loop0", "/tmp/LTP_staTPRruR/mntpoint", "fuseblk", 0, "allow_other,blksize=4096,fd=4,rootmode=40000,user_id=0,group_id=0") = 0 3890607 statmount({size=24, mnt_id=0x80010957, param=STATMOUNT_SB_BASIC}, {size=512, mask=STATMOUNT_SB_BASIC, sb_dev_major=7, sb_dev_minor=0, sb_magic=FUSE_SUPER_MAGIC, sb_flags=0}, 512, 0) = 0Signed-off-by Jan Polensky <[email protected]>Reviewed-by Petr Vorel <[email protected]>---
Change since v1 (Thanks Cyril & thanks for the ping):
* Removed restriction for NTFS.lib/safe_macros.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)lib/safe_macros.c +7
-3@@ -942,10 +942,15 @@ int safe_mount(const char *file, const int lineno, void (*cleanup_fn)(void),*/ if (possibly_fuse (filesystemtype)) {char buf[1024 ]; +const char * mount_fmt;tst_resm_ (file, lineno,TINFO ,"Trying FUSE..." ); -snprintf (buf,sizeof (buf),"mount.%s '%s' '%s'" , - filesystemtype, source, target); +if (mountflags ==MS_RDONLY ) + mount_fmt ="mount.%s -o ro '%s' '%s'" ; +else + mount_fmt ="mount.%s '%s' '%s'" ; +snprintf (buf,sizeof (buf), mount_fmt, filesystemtype, + source, target); rval =tst_system (buf);if (WIFEXITED (rval) &&WEXITSTATUS (rval) ==0 ) --2.50.1
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
Petr Vorel
Reviewed-byHi all,
Quoted 1 line
nit: maybe the patch title also should not mention NTFS.
+1
@Cyril do you want to have a final look before I merge?
Kind regards,
Petr
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp