You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

96 lines
2.8 KiB

diff --git a/test/core.c b/test/core.c
index b9e3bbf..4b36b2d 100644
--- a/test/core.c
+++ b/test/core.c
@@ -129,8 +129,6 @@ int nfit_test_init(struct kmod_ctx **ctx, struct kmod_module **mod,
"nfit",
"device_dax",
"dax_pmem",
- "dax_pmem_core",
- "dax_pmem_compat",
"libnvdimm",
"nd_blk",
"nd_btt",
diff --git a/test/device-dax.c b/test/device-dax.c
index b19c1ed..d85862b 100644
--- a/test/device-dax.c
+++ b/test/device-dax.c
@@ -166,6 +166,7 @@ static int __test_device_dax(unsigned long align, int loglevel,
if (!ndctl_test_attempt(test, KERNEL_VERSION(4, 7, 0)))
return 77;
+#if 0
/* setup up fsdax mode pmem device and seed with verification data */
rc = setup_pmem_fsdax_mode(ndns, align);
if (rc < 0 || !(pfn = ndctl_namespace_get_pfn(ndns))) {
@@ -199,7 +200,7 @@ static int __test_device_dax(unsigned long align, int loglevel,
}
fsync(fd);
close(fd);
-
+#endif
/* switch the namespace to device-dax mode and verify data via mmap */
rc = setup_device_dax(ndns, align);
if (rc < 0) {
@@ -219,6 +220,7 @@ static int __test_device_dax(unsigned long align, int loglevel,
}
sprintf(path, "/dev/%s", daxctl_dev_get_devname(dev));
+#if 0
fd = open(path, O_RDONLY);
if (fd < 0) {
fprintf(stderr, "%s: failed to open(O_RDONLY) device-dax instance\n",
@@ -246,7 +248,7 @@ static int __test_device_dax(unsigned long align, int loglevel,
close(fd);
munmap(buf, VERIFY_SIZE(align));
-
+#endif
/*
* Prior to 4.8-final these tests cause crashes, or are
* otherwise not supported.
@@ -262,6 +264,7 @@ static int __test_device_dax(unsigned long align, int loglevel,
rc = -ENXIO;
goto out;
}
+
rc = test_dax_directio(fd, align, NULL, 0);
if (rc) {
fprintf(stderr, "%s: failed dax direct-i/o\n",
diff --git a/test/libndctl.c b/test/libndctl.c
index 02bb9cc..2a20941 100644
--- a/test/libndctl.c
+++ b/test/libndctl.c
@@ -160,9 +160,9 @@ static struct btt {
int enabled;
uuid_t uuid;
int num_sector_sizes;
- unsigned int sector_sizes[7];
+ unsigned int sector_sizes[2];
} default_btt = {
- 0, { 0, }, 7, { 512, 520, 528, 4096, 4104, 4160, 4224, },
+ 0, { 0, }, 2, { 512, 4096, },
};
struct pfn {
@@ -214,8 +214,8 @@ static struct btt btt_settings = {
.uuid = { 0, 1, 2, 3, 4, 5, 6, 7,
8, 9, 10, 11, 12, 13, 14, 15
},
- .num_sector_sizes = 7,
- .sector_sizes = { 512, 520, 528, 4096, 4104, 4160, 4224, },
+ .num_sector_sizes = 2,
+ .sector_sizes = { 512, 4096, },
};
static struct pfn pfn_settings = {
@@ -250,7 +250,7 @@ struct namespace {
};
static uuid_t null_uuid;
-static unsigned long blk_sector_sizes[] = { 512, 520, 528, 4096, 4104, 4160, 4224, };
+static unsigned long blk_sector_sizes[] = { 512, 4096, };
static unsigned long pmem_sector_sizes[] = { 512, 4096 };
static unsigned long io_sector_sizes[] = { 0 };