[LTP] [PATCH] syscalls/statx01: Add exit condition when parsing /proc/self/mountinfo
xuyang2018.jy@fujitsu.com
xuyang2018.jy@fujitsu.com
Tue Dec 13 02:51:18 CET 2022
Hi Richard
> Hello,
>
> Yang Xu <xuyang2018.jy@fujitsu.com> writes:
>
>> When using user filesystem such as overlayfs, the current parsing way can't
>> work well.
>>
>> 63 66 8:3 / /sysroot rw,relatime - ext4 /dev/sda3 rw,seclabel
>> 43 66 8:3 /ostree/deploy/rhivos/var /var rw,relatime shared:3 - ext4 /dev/sda3 rw,seclabel
>>
>> So add the exit condition for statx.mnt_id check so it can skip the
>> underflying filesystem and parse the correct user fileystem's mnt_id.
>>
>> Fixes: #1001
>> Signed-off-by: Yang Xu <xuyang2018.jy@fujitsu.com>
>> ---
>> testcases/kernel/syscalls/statx/statx01.c | 3 ++-
>> 1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/testcases/kernel/syscalls/statx/statx01.c b/testcases/kernel/syscalls/statx/statx01.c
>> index 60b50958b..931aa60c1 100644
>> --- a/testcases/kernel/syscalls/statx/statx01.c
>> +++ b/testcases/kernel/syscalls/statx/statx01.c
>> @@ -68,7 +68,8 @@ static void test_mnt_id(struct statx *buf)
>> if (sscanf(line, "%"SCNu64" %*d %d:%d", &mnt_id, &line_mjr, &line_mnr) != 3)
>> continue;
>>
>> - if (line_mjr == buf->stx_dev_major && line_mnr == buf->stx_dev_minor)
>> + if (line_mjr == buf->stx_dev_major && line_mnr == buf->stx_dev_minor &&
>> + mnt_id == buf->stx_mnt_id)
>
> The fail message after this point doesn't make sense with this change.
>
> if (buf->stx_mnt_id == mnt_id)
> tst_res(TPASS,
> "statx.stx_mnt_id equals to mount_id(%"PRIu64") in /proc/self/mountinfo",
> mnt_id);
> else
> tst_res(TFAIL,
> "statx.stx_mnt_id(%"PRIu64") is different from mount_id(%"PRIu64") in /proc/self/mountinfo",
> (uint64_t)buf->stx_mnt_id, mnt_id);
>
> It'll print whatever the last mnt_id is which is probably unrelated.
Good catch, will send v2.
Best Regards
Yang Xu
>
More information about the ltp
mailing list