[LTP] [PATCH 1/2] syscalls/statx01: Fix compiler warning because of PRIu64

[LTP] [PATCH 1/2] syscalls/statx01: Fix compiler warning because of PRIu64

[Yang Xu]

warning: format ‘%lu’ expects argument of type ‘long unsigned int’,
but argument 5 has type ‘__u64’ {aka ‘long long unsigned int’}

Signed-off-by: Yang Xu <xuyang2018.jy@fujitsu.com>
---
 testcases/kernel/syscalls/statx/statx01.c | 8 ++++----
 testcases/kernel/syscalls/statx/statx02.c | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/testcases/kernel/syscalls/statx/statx01.c b/testcases/kernel/syscalls/statx/statx01.c
index 2358dd7bc..1289366b9 100644
--- a/testcases/kernel/syscalls/statx/statx01.c
+++ b/testcases/kernel/syscalls/statx/statx01.c
@@ -79,11 +79,11 @@ static void test_normal_file(void)
 
 	if (buff.stx_size == SIZE)
 		tst_res(TPASS,
-			"stx_size(%"PRIu64") is correct", buff.stx_size);
+			"stx_size(%"PRIu64") is correct", (uint64_t)buff.stx_size);
 	else
 		tst_res(TFAIL,
 			"stx_size(%"PRIu64") is different from expected(%u)",
-			buff.stx_size, SIZE);
+			(uint64_t)buff.stx_size, SIZE);
 
 	if ((buff.stx_mode & ~(S_IFMT)) == MODE)
 		tst_res(TPASS, "stx_mode(%u) is correct", buff.stx_mode);
@@ -94,10 +94,10 @@ static void test_normal_file(void)
 
 	if (buff.stx_blocks <= buff.stx_blksize/512 * 2)
 		tst_res(TPASS, "stx_blocks(%"PRIu64") is valid",
-			buff.stx_blocks);
+			(uint64_t)buff.stx_blocks);
 	else
 		tst_res(TFAIL, "stx_blocks(%"PRIu64") is invalid",
-			buff.stx_blocks);
+			(uint64_t)buff.stx_blocks);
 
 }
 
diff --git a/testcases/kernel/syscalls/statx/statx02.c b/testcases/kernel/syscalls/statx/statx02.c
index 08ea940cb..63133a3b7 100644
--- a/testcases/kernel/syscalls/statx/statx02.c
+++ b/testcases/kernel/syscalls/statx/statx02.c
@@ -50,11 +50,11 @@ static void test_empty_path(void)
 
 	if (buf.stx_size == SIZE)
 		tst_res(TPASS,
-			"stx_size(%"PRIu64") is correct", buf.stx_size);
+			"stx_size(%"PRIu64") is correct", (uint64_t)buf.stx_size);
 	else
 		tst_res(TFAIL,
 			"stx_size(%"PRIu64") is not same as expected(%u)",
-			buf.stx_size, SIZE);
+			(uint64_t)buf.stx_size, SIZE);
 
 }
 
-- 
2.23.0


-- 
Mailing list info: https://lists.linux.it/listinfo/ltp

[LTP] [PATCH 2/2] syscalls/stat*: Add nlink member check

[Yang Xu]

Signed-off-by: Yang Xu <xuyang2018.jy@fujitsu.com>
---
mount_id member check will add in the next week.
[1]https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=fa2fcf4
[2]https://git.kernel.org/pub/scm/docs/man-pages/man-pages.git/commit/?id=728009a47497b6
 testcases/kernel/syscalls/stat/stat01.c   | 8 +++++++-
 testcases/kernel/syscalls/statx/statx01.c | 6 ++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/testcases/kernel/syscalls/stat/stat01.c b/testcases/kernel/syscalls/stat/stat01.c
index 14f1036d5..0f5c1dcc2 100644
--- a/testcases/kernel/syscalls/stat/stat01.c
+++ b/testcases/kernel/syscalls/stat/stat01.c
@@ -71,11 +71,17 @@ static void verify_stat(unsigned int n)
 		fail++;
 	}
 
+	if (stat_buf.st_nlink != 1) {
+		tst_res(TFAIL, "stat_buf.st_nlink = %lu expected 1",
+			stat_buf.st_nlink);
+		fail++;
+	}
+
 	if (!fail)
 		tst_res(TPASS, "stat(%s)", tc->pathname);
 }
 
-void setup(void)
+static void setup(void)
 {
 	unsigned int i;
 
diff --git a/testcases/kernel/syscalls/statx/statx01.c b/testcases/kernel/syscalls/statx/statx01.c
index 1289366b9..63d97b8c7 100644
--- a/testcases/kernel/syscalls/statx/statx01.c
+++ b/testcases/kernel/syscalls/statx/statx01.c
@@ -16,6 +16,7 @@
  * 3) mode
  * 4) blocks
  * 5) size
+ * 6) nlink
  *
  * A file is created and metadata values are set with
  * predefined values.
@@ -99,6 +100,11 @@ static void test_normal_file(void)
 		tst_res(TFAIL, "stx_blocks(%"PRIu64") is invalid",
 			(uint64_t)buff.stx_blocks);
 
+	if (buff.stx_nlink == 1)
+		tst_res(TPASS, "stx_nlink(1) is correct");
+	else
+		tst_res(TFAIL, "stx_nlink(%u) is different from expected(1)",
+			buff.stx_nlink);
 }
 
 static void test_device_file(void)
-- 
2.23.0


-- 
Mailing list info: https://lists.linux.it/listinfo/ltp

Re: [LTP] [PATCH 2/2] syscalls/stat*: Add nlink member check

[Cyril Hrubis]

Hi!
Reviwed-by: Cyril Hrubis <chrubis@suse.cz>

-- 
Cyril Hrubis
chrubis@suse.cz

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp

Re: [LTP] [PATCH 2/2] syscalls/stat*: Add nlink member check

[xuyang2018.jy]

Hi Cyril
> Hi!
> Reviwed-by: Cyril Hrubis<chrubis@suse.cz>
Since the 1st patch seems unnecessary(I seen your patch), I only merged 
this nlink member check patch.

Best Regards
Yang Xu
>

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp

Re: [LTP] [PATCH 1/2] syscalls/statx01: Fix compiler warning because of PRIu64

[Cyril Hrubis]

Hi!
> warning: format ???%lu??? expects argument of type ???long unsigned int???,
> but argument 5 has type ???__u64??? {aka ???long long unsigned int???}

This is strange, the stx_size is either defined as uint64_t in our
fallback code or as __u64 in the system headers. It should really match
the PRIu64.

I see the warnings on my system as well, it looks like
/usr/include/asm-generic/int-ll64.h is used even on 64bit system e.g.
x86_64 that does not make any sense.

> Signed-off-by: Yang Xu <xuyang2018.jy@fujitsu.com>
> ---
>  testcases/kernel/syscalls/statx/statx01.c | 8 ++++----
>  testcases/kernel/syscalls/statx/statx02.c | 4 ++--
>  2 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/testcases/kernel/syscalls/statx/statx01.c b/testcases/kernel/syscalls/statx/statx01.c
> index 2358dd7bc..1289366b9 100644
> --- a/testcases/kernel/syscalls/statx/statx01.c
> +++ b/testcases/kernel/syscalls/statx/statx01.c
> @@ -79,11 +79,11 @@ static void test_normal_file(void)
>  
>  	if (buff.stx_size == SIZE)
>  		tst_res(TPASS,
> -			"stx_size(%"PRIu64") is correct", buff.stx_size);
> +			"stx_size(%"PRIu64") is correct", (uint64_t)buff.stx_size);
>  	else
>  		tst_res(TFAIL,
>  			"stx_size(%"PRIu64") is different from expected(%u)",
> -			buff.stx_size, SIZE);
> +			(uint64_t)buff.stx_size, SIZE);
>  
>  	if ((buff.stx_mode & ~(S_IFMT)) == MODE)
>  		tst_res(TPASS, "stx_mode(%u) is correct", buff.stx_mode);
> @@ -94,10 +94,10 @@ static void test_normal_file(void)
>  
>  	if (buff.stx_blocks <= buff.stx_blksize/512 * 2)
>  		tst_res(TPASS, "stx_blocks(%"PRIu64") is valid",
> -			buff.stx_blocks);
> +			(uint64_t)buff.stx_blocks);
>  	else
>  		tst_res(TFAIL, "stx_blocks(%"PRIu64") is invalid",
> -			buff.stx_blocks);
> +			(uint64_t)buff.stx_blocks);
>  
>  }
>  
> diff --git a/testcases/kernel/syscalls/statx/statx02.c b/testcases/kernel/syscalls/statx/statx02.c
> index 08ea940cb..63133a3b7 100644
> --- a/testcases/kernel/syscalls/statx/statx02.c
> +++ b/testcases/kernel/syscalls/statx/statx02.c
> @@ -50,11 +50,11 @@ static void test_empty_path(void)
>  
>  	if (buf.stx_size == SIZE)
>  		tst_res(TPASS,
> -			"stx_size(%"PRIu64") is correct", buf.stx_size);
> +			"stx_size(%"PRIu64") is correct", (uint64_t)buf.stx_size);
>  	else
>  		tst_res(TFAIL,
>  			"stx_size(%"PRIu64") is not same as expected(%u)",
> -			buf.stx_size, SIZE);
> +			(uint64_t)buf.stx_size, SIZE);
>  
>  }
>  
> -- 
> 2.23.0
> 
> 
> -- 
> Mailing list info: https://lists.linux.it/listinfo/ltp

-- 
Cyril Hrubis
chrubis@suse.cz

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp

Re: [LTP] [PATCH 1/2] syscalls/statx01: Fix compiler warning because of PRIu64

[Cyril Hrubis]

Hi!
Looks like the __u64 is not going to be compatible in userspace and we
cannot do better than explicit casts anytime soon.

Reviewed-by: Cyril Hrubis <chrubis@suse.cz>

-- 
Cyril Hrubis
chrubis@suse.cz

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp

Re: [LTP] [PATCH 1/2] syscalls/statx01: Fix compiler warning because of PRIu64

[xuyang2018.jy]

Hi Cyril
> Hi!
> Looks like the __u64 is not going to be compatible in userspace and we
> cannot do better than explicit casts anytime soon.
>
> Reviewed-by: Cyril Hrubis<chrubis@suse.cz>
Merged. Thanks for your effort!

Best Regards
Yang Xu
>

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp