safe_macros.c: Fix missing ro flag for FUSE mounts
PATCH v3 1/1 safe_macros.c: Fix missing ro flag for FUSE mounts
The test incorrectly assumes that FUSE 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.
Change since v2 (Thanks Avinesh):
* Changed commit title from: "Fix missing ro flag for FUSE NTFS mounts"
lib/safe_macros.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
lib/safe_macros.c +7 -2
@@ -945,10 +945,15 @@ int safe_mount(const char *file, const int lineno, void (*cleanup_fn)(void),tst_resm_ (file, lineno,TINFO ,"tst_is_fuse: %d" ,tst_is_fuse (source));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);tst_resm_ (file, lineno,TINFO ,"tst_is_fuse: %d" ,tst_is_fuse (source));
--
2.50.1
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
Hi all,
Quoted 3 lines
The test incorrectly assumes that FUSE 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.
@Cyril actually v3 is the final version to have a look.
Kind regards,
Petr
Quoted 47 lines
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) = 0Reviewed-by Avinesh Kumar <[email protected]>Reviewed-by Petr Vorel <[email protected]>Signed-off-by Jan Polensky <[email protected]>---
Change since v1 (Thanks Cyril & thanks for the ping):
* Removed restriction for NTFS.
Change since v2 (Thanks Avinesh):
* Changed commit title from: "Fix missing ro flag for FUSE NTFS mounts"lib/safe_macros.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)lib/safe_macros.c +7
-2@@ -945,10 +945,15 @@ int safe_mount(const char *file, const int lineno, void (*cleanup_fn)(void),tst_resm_ (file, lineno,TINFO ,"tst_is_fuse: %d" ,tst_is_fuse (source));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);tst_resm_ (file, lineno,TINFO ,"tst_is_fuse: %d" ,tst_is_fuse (source));
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
Hi!
I've actually send a similar patch since Jan wasn't responding:
http://patchwork.ozlabs.org/project/ltp/patch/[email protected]/
That just adds '-o ro' or '' as '%s' to the original format.
Signature · 5 lines
Cyril Hrubis [email protected] -- Mailing list info: https://lists.linux.it/listinfo/ltp
Quoted 10 lines · Cyril Hrubis
Hi!
I've actually send a similar patch since Jan wasn't responding:http://patchwork.ozlabs.org/project/ltp/patch/[email protected]/
That just adds '-o ro' or '' as '%s' to the original format.
--
Cyril Hrubis
[email protected]
What matters most is that the issue gets resolved. I’d be very grateful if a fix could be made available in the near future.
Thanks again for the helpful input and best regards! Jan
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
Hi all,
NOTE: v3 does not apply due wrong context.
I'm going to merge v2 with a fixed title (wait little longer to give Cyril chance to review).
Kind regards,
Petr
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp