Re: [PATCH v2 8/8] tests/9pfs: add local Tunlinkat hard link test

2020-10-22 Thread Greg Kurz
On Wed, 21 Oct 2020 14:55:46 +0200
Christian Schoenebeck  wrote:

> This test case uses a Tunlinkat request to remove a previously hard
> linked file by using the 9pfs 'local' fs driver.
> 
> Signed-off-by: Christian Schoenebeck 
> ---

Reviewed-by: Greg Kurz 

>  tests/qtest/virtio-9p-test.c | 30 ++
>  1 file changed, 30 insertions(+)
> 
> diff --git a/tests/qtest/virtio-9p-test.c b/tests/qtest/virtio-9p-test.c
> index 460fa49fe3..23433913bb 100644
> --- a/tests/qtest/virtio-9p-test.c
> +++ b/tests/qtest/virtio-9p-test.c
> @@ -1391,6 +1391,34 @@ static void fs_hardlink_file(void *obj, void *data, 
> QGuestAllocator *t_alloc)
>  g_free(real_file);
>  }
>  
> +static void fs_unlinkat_hardlink(void *obj, void *data,
> + QGuestAllocator *t_alloc)
> +{
> +QVirtio9P *v9p = obj;
> +alloc = t_alloc;
> +struct stat st_real, st_link;
> +char *real_file = virtio_9p_test_path("08/real_file");
> +char *hardlink_file = virtio_9p_test_path("08/hardlink_file");
> +
> +do_attach(v9p);
> +do_mkdir(v9p, "/", "08");
> +do_lcreate(v9p, "08", "real_file");
> +g_assert(stat(real_file, _real) == 0);
> +g_assert((st_real.st_mode & S_IFMT) == S_IFREG);
> +
> +do_hardlink(v9p, "08", "hardlink_file", "08/real_file");
> +g_assert(stat(hardlink_file, _link) == 0);
> +
> +do_unlinkat(v9p, "08", "hardlink_file", 0);
> +/* symlink should be gone now */
> +g_assert(stat(hardlink_file, _link) != 0);
> +/* and old file should still exist */
> +g_assert(stat(real_file, _real) == 0);
> +
> +g_free(hardlink_file);
> +g_free(real_file);
> +}
> +
>  static void *assign_9p_local_driver(GString *cmd_line, void *arg)
>  {
>  virtio_9p_assign_local_driver(cmd_line, "security_model=mapped-xattr");
> @@ -1438,6 +1466,8 @@ static void register_virtio_9p_test(void)
>  qos_add_test("local/unlinkat_symlink", "virtio-9p", fs_unlinkat_symlink,
>   );
>  qos_add_test("local/hardlink_file", "virtio-9p", fs_hardlink_file, 
> );
> +qos_add_test("local/unlinkat_hardlink", "virtio-9p", 
> fs_unlinkat_hardlink,
> + );
>  }
>  
>  libqos_init(register_virtio_9p_test);




[PATCH v2 8/8] tests/9pfs: add local Tunlinkat hard link test

2020-10-21 Thread Christian Schoenebeck
This test case uses a Tunlinkat request to remove a previously hard
linked file by using the 9pfs 'local' fs driver.

Signed-off-by: Christian Schoenebeck 
---
 tests/qtest/virtio-9p-test.c | 30 ++
 1 file changed, 30 insertions(+)

diff --git a/tests/qtest/virtio-9p-test.c b/tests/qtest/virtio-9p-test.c
index 460fa49fe3..23433913bb 100644
--- a/tests/qtest/virtio-9p-test.c
+++ b/tests/qtest/virtio-9p-test.c
@@ -1391,6 +1391,34 @@ static void fs_hardlink_file(void *obj, void *data, 
QGuestAllocator *t_alloc)
 g_free(real_file);
 }
 
+static void fs_unlinkat_hardlink(void *obj, void *data,
+ QGuestAllocator *t_alloc)
+{
+QVirtio9P *v9p = obj;
+alloc = t_alloc;
+struct stat st_real, st_link;
+char *real_file = virtio_9p_test_path("08/real_file");
+char *hardlink_file = virtio_9p_test_path("08/hardlink_file");
+
+do_attach(v9p);
+do_mkdir(v9p, "/", "08");
+do_lcreate(v9p, "08", "real_file");
+g_assert(stat(real_file, _real) == 0);
+g_assert((st_real.st_mode & S_IFMT) == S_IFREG);
+
+do_hardlink(v9p, "08", "hardlink_file", "08/real_file");
+g_assert(stat(hardlink_file, _link) == 0);
+
+do_unlinkat(v9p, "08", "hardlink_file", 0);
+/* symlink should be gone now */
+g_assert(stat(hardlink_file, _link) != 0);
+/* and old file should still exist */
+g_assert(stat(real_file, _real) == 0);
+
+g_free(hardlink_file);
+g_free(real_file);
+}
+
 static void *assign_9p_local_driver(GString *cmd_line, void *arg)
 {
 virtio_9p_assign_local_driver(cmd_line, "security_model=mapped-xattr");
@@ -1438,6 +1466,8 @@ static void register_virtio_9p_test(void)
 qos_add_test("local/unlinkat_symlink", "virtio-9p", fs_unlinkat_symlink,
  );
 qos_add_test("local/hardlink_file", "virtio-9p", fs_hardlink_file, );
+qos_add_test("local/unlinkat_hardlink", "virtio-9p", fs_unlinkat_hardlink,
+ );
 }
 
 libqos_init(register_virtio_9p_test);
-- 
2.20.1