diff mbox

[ndctl,1/2] ndctl: complete removal of daxctl io

Message ID 20180322184007.25667-1-ross.zwisler@linux.intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Ross Zwisler March 22, 2018, 6:40 p.m. UTC 
commit 0a8dd795b4cf ("ndctl: removing daxctl io")

didn't fully remove all daxctl io, leaving behind a few of the lines which
were added by the original commit:

commit 67b54c1c76e5 ("ndctl: daxctl: Adding io option for daxctl")

Signed-off-by: Ross Zwisler <ross.zwisler@linux.intel.com>
Cc: Dave Jiang <dave.jiang@intel.com>
Fixes: commit 0a8dd795b4cf ("ndctl: removing daxctl io")
---
 daxctl/Makefile.am | 1 -
 daxctl/daxctl.c    | 6 ------
 ndctl.spec.in      | 7 -------
 3 files changed, 14 deletions(-)

Comments

Dan Williams March 22, 2018, 10:23 p.m. UTC | #1 
On Thu, Mar 22, 2018 at 11:40 AM, Ross Zwisler
<ross.zwisler@linux.intel.com> wrote:
> commit 0a8dd795b4cf ("ndctl: removing daxctl io")
>
> didn't fully remove all daxctl io, leaving behind a few of the lines which
> were added by the original commit:
>
> commit 67b54c1c76e5 ("ndctl: daxctl: Adding io option for daxctl")
>
> Signed-off-by: Ross Zwisler <ross.zwisler@linux.intel.com>
> Cc: Dave Jiang <dave.jiang@intel.com>
> Fixes: commit 0a8dd795b4cf ("ndctl: removing daxctl io")

Yup, looks good, applied.
diff mbox

Patch

diff --git a/daxctl/Makefile.am b/daxctl/Makefile.am
index e256afd..fe467d0 100644
--- a/daxctl/Makefile.am
+++ b/daxctl/Makefile.am
@@ -9,7 +9,6 @@  daxctl_SOURCES =\
 
 daxctl_LDADD =\
 	lib/libdaxctl.la \
-	../ndctl/lib/libndctl.la \
 	../libutil.a \
 	$(UUID_LIBS) \
 	$(JSON_LIBS)
diff --git a/daxctl/daxctl.c b/daxctl/daxctl.c
index cedc847..91a4600 100644
--- a/daxctl/daxctl.c
+++ b/daxctl/daxctl.c
@@ -67,17 +67,11 @@  static int cmd_help(int argc, const char **argv, void *ctx)
 }
 
 int cmd_list(int argc, const char **argv, void *ctx);
-#ifdef ENABLE_DAXIO
-int cmd_io(int argc, const char **argv, void *ctx);
-#endif
 
 static struct cmd_struct commands[] = {
 	{ "version", cmd_version },
 	{ "list", cmd_list },
 	{ "help", cmd_help },
-#ifdef ENABLE_DAXIO
-	{ "io", cmd_io },
-#endif
 };
 
 int main(int argc, const char **argv)
diff --git a/ndctl.spec.in b/ndctl.spec.in
index 3a5edc3..e2c879c 100644
--- a/ndctl.spec.in
+++ b/ndctl.spec.in
@@ -20,9 +20,6 @@  BuildRequires:	pkgconfig(libudev)
 BuildRequires:	pkgconfig(uuid)
 BuildRequires:	pkgconfig(json-c)
 BuildRequires:	pkgconfig(bash-completion)
-%ifarch x86_64
-BuildRequires:	pkgconfig(libpmem)
-%endif
 
 %description
 Utility library for managing the "libnvdimm" subsystem.  The "libnvdimm"
@@ -93,11 +90,7 @@  control API for these devices.
 %build
 echo %{version} > version
 ./autogen.sh
-%ifarch x86_64
-%configure --disable-static --disable-silent-rules --with-libpmem
-%else
 %configure --disable-static --disable-silent-rules
-%endif
 make %{?_smp_mflags}
 
 %install