Merge pull request #1714 from krzycz/pmem-is_pmem_fix_1.2

pmem: fix wrong is_pmem returned by pmem_map_file

src/libpmem/pmem.c

@@ -664,11 +664,18 @@ pmem_map_file(const char *path, size_t len, int flags, mode_t mode,
 	if ((addr = util_map(fd, len, 0, 0)) == NULL)
 		goto err;    /* util_map() set errno, called LOG */
 
+#ifndef _WIN32
+	/* XXX only Device DAX regions (PMEM) are tracked so far */
+	if (is_dev_dax && util_range_register(addr, len) != 0) {
+		LOG(2, "can't track mapped region");
+	}
+#endif
+
 	if (mapped_lenp != NULL)
 		*mapped_lenp = len;
 
 	if (is_pmemp != NULL)
-		*is_pmemp = pmem_is_pmem(addr, len);
+		*is_pmemp = is_dev_dax || pmem_is_pmem(addr, len);
 
 	LOG(3, "returning %p", addr);
 
@@ -677,13 +684,6 @@ pmem_map_file(const char *path, size_t len, int flags, mode_t mode,
 
 	(void) close(fd);
 
-#ifndef _WIN32
-	/* XXX only Device DAX regions (PMEM) are tracked so far */
-	if (is_dev_dax && util_range_register(addr, len) != 0) {
-		LOG(2, "can't track mapped region");
-	}
-#endif
-
 	return addr;
 
 err:

src/test/pmem_map/pmem_map.c

@@ -234,6 +234,14 @@ main(int argc, char *argv[])
 		}
 
 		if (addr) {
+			/* is_pmem must be true for device DAX */
+			int is_pmem_check = pmem_is_pmem(addr, mlen);
+			UT_ASSERT(!is_dev_dax || is_pmem_check);
+
+			/* check is_pmem returned from pmem_map_file */
+			if (use_is_pmem)
+				UT_ASSERTeq(is_pmem, is_pmem_check);
+
 			if ((flags & PMEM_FILE_TMPFILE) == 0 && !is_dev_dax) {
 				fd = OPEN(argv[i], O_RDWR);