[lxc-devel] [lxc/master] commands: fully revert set_running_config_item()

brauner on Github lxc-bot at linuxcontainers.org
Wed Jan 3 17:29:53 UTC 2018


A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 405 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20180103/eaba26c5/attachment.bin>
-------------- next part --------------
From a3edf26779576d2d5017ee4caecc02f47b5f383b Mon Sep 17 00:00:00 2001
From: Christian Brauner <christian.brauner at ubuntu.com>
Date: Wed, 3 Jan 2018 18:28:58 +0100
Subject: [PATCH] commands: fully revert set_running_config_item()

The noop implementation is pointless.

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>
---
 src/lxc/commands.c | 8 --------
 src/lxc/commands.h | 1 -
 2 files changed, 9 deletions(-)

diff --git a/src/lxc/commands.c b/src/lxc/commands.c
index bf8cc04de..8ce658363 100644
--- a/src/lxc/commands.c
+++ b/src/lxc/commands.c
@@ -92,7 +92,6 @@ static const char *lxc_cmd_str(lxc_cmd_t cmd)
 		[LXC_CMD_GET_NAME]         = "get_name",
 		[LXC_CMD_GET_LXCPATH]      = "get_lxcpath",
 		[LXC_CMD_ADD_STATE_CLIENT] = "add_state_client",
-		[LXC_CMD_NOOP]             = "noop",
 		[LXC_CMD_CONSOLE_LOG]      = "console_log",
 	};
 
@@ -1056,12 +1055,6 @@ static int lxc_cmd_console_log_callback(int fd, struct lxc_cmd_req *req,
 	return lxc_cmd_rsp_send(fd, &rsp);
 }
 
-static int lxc_cmd_noop_callback(int fd, struct lxc_cmd_req *req,
-				 struct lxc_handler *handler)
-{
-	return 0;
-}
-
 static int lxc_cmd_process(int fd, struct lxc_cmd_req *req,
 			   struct lxc_handler *handler)
 {
@@ -1079,7 +1072,6 @@ static int lxc_cmd_process(int fd, struct lxc_cmd_req *req,
 		[LXC_CMD_GET_NAME]         = lxc_cmd_get_name_callback,
 		[LXC_CMD_GET_LXCPATH]      = lxc_cmd_get_lxcpath_callback,
 		[LXC_CMD_ADD_STATE_CLIENT] = lxc_cmd_add_state_client_callback,
-		[LXC_CMD_NOOP]             = lxc_cmd_noop_callback,
 		[LXC_CMD_CONSOLE_LOG]      = lxc_cmd_console_log_callback,
 	};
 
diff --git a/src/lxc/commands.h b/src/lxc/commands.h
index a114b6867..bfdb03997 100644
--- a/src/lxc/commands.h
+++ b/src/lxc/commands.h
@@ -49,7 +49,6 @@ typedef enum {
 	LXC_CMD_GET_NAME,
 	LXC_CMD_GET_LXCPATH,
 	LXC_CMD_ADD_STATE_CLIENT,
-	LXC_CMD_NOOP,
 	LXC_CMD_CONSOLE_LOG,
 	LXC_CMD_MAX,
 } lxc_cmd_t;


More information about the lxc-devel mailing list