| Andrew Geissler | 9aee500 | 2022-03-30 16:27:02 +0000 | [diff] [blame^] | 1 | From 932252c0ba54a51c8bcf58b747656e29cdebfa6a Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Sat, 26 Mar 2022 13:06:50 -0700 |
| 4 | Subject: [PATCH] use daxctl/libdaxctl.h instead of ndctl/libdaxctl.h |
| 5 | |
| 6 | Upstream-Status: Submitted [https://github.com/pmem/pmdk/pull/5413] |
| 7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 8 | --- |
| 9 | src/libpmem2/badblocks_ndctl.c | 2 +- |
| 10 | src/libpmem2/region_namespace_ndctl.c | 2 +- |
| 11 | src/libpmem2/usc_ndctl.c | 2 +- |
| 12 | src/tools/daxio/daxio.c | 2 +- |
| 13 | 4 files changed, 4 insertions(+), 4 deletions(-) |
| 14 | |
| 15 | diff --git a/src/libpmem2/badblocks_ndctl.c b/src/libpmem2/badblocks_ndctl.c |
| 16 | index 9a5910bba..cc637f7f4 100644 |
| 17 | --- a/src/libpmem2/badblocks_ndctl.c |
| 18 | +++ b/src/libpmem2/badblocks_ndctl.c |
| 19 | @@ -16,7 +16,7 @@ |
| 20 | #include <sys/sysmacros.h> |
| 21 | #include <fcntl.h> |
| 22 | #include <ndctl/libndctl.h> |
| 23 | -#include <ndctl/libdaxctl.h> |
| 24 | +#include <daxctl/libdaxctl.h> |
| 25 | |
| 26 | #include "libpmem2.h" |
| 27 | #include "pmem2_utils.h" |
| 28 | diff --git a/src/libpmem2/region_namespace_ndctl.c b/src/libpmem2/region_namespace_ndctl.c |
| 29 | index 1383796a9..e31185984 100644 |
| 30 | --- a/src/libpmem2/region_namespace_ndctl.c |
| 31 | +++ b/src/libpmem2/region_namespace_ndctl.c |
| 32 | @@ -6,7 +6,7 @@ |
| 33 | */ |
| 34 | |
| 35 | #include <ndctl/libndctl.h> |
| 36 | -#include <ndctl/libdaxctl.h> |
| 37 | +#include <daxctl/libdaxctl.h> |
| 38 | #include <sys/sysmacros.h> |
| 39 | #include <fcntl.h> |
| 40 | |
| 41 | diff --git a/src/libpmem2/usc_ndctl.c b/src/libpmem2/usc_ndctl.c |
| 42 | index be63e879b..c58032a83 100644 |
| 43 | --- a/src/libpmem2/usc_ndctl.c |
| 44 | +++ b/src/libpmem2/usc_ndctl.c |
| 45 | @@ -5,7 +5,7 @@ |
| 46 | * usc_ndctl.c -- pmem2 usc function for platforms using ndctl |
| 47 | */ |
| 48 | #include <ndctl/libndctl.h> |
| 49 | -#include <ndctl/libdaxctl.h> |
| 50 | +#include <daxctl/libdaxctl.h> |
| 51 | #include <sys/types.h> |
| 52 | #include <sys/sysmacros.h> |
| 53 | #include <fcntl.h> |
| 54 | diff --git a/src/tools/daxio/daxio.c b/src/tools/daxio/daxio.c |
| 55 | index 66cd0b7ae..7f2c89d48 100644 |
| 56 | --- a/src/tools/daxio/daxio.c |
| 57 | +++ b/src/tools/daxio/daxio.c |
| 58 | @@ -21,7 +21,7 @@ |
| 59 | #include <string.h> |
| 60 | |
| 61 | #include <ndctl/libndctl.h> |
| 62 | -#include <ndctl/libdaxctl.h> |
| 63 | +#include <daxctl/libdaxctl.h> |
| 64 | #include <libpmem.h> |
| 65 | |
| 66 | #include "util.h" |
| 67 | -- |
| 68 | 2.35.1 |
| 69 | |