s/_NS_/_DOMAIN_/g

7 files changed, 19 insertions, 19 deletions

diff --git a/domain.h b/domain.h
index d71ad907bbf..4c7d9279301 100644
--- a/domain.h
+++ b/domain.h
@@ -10,8 +10,8 @@
  * your option) any later version.
  */
 
-#ifndef __KDBUS_NS_H
-#define __KDBUS_NS_H
+#ifndef __KDBUS_DOMAIN_H
+#define __KDBUS_DOMAIN_H
 
 #include <linux/hashtable.h>
 #include <linux/idr.h>
@@ -43,7 +43,7 @@
  * stays around for forver.
  *
  * A domain is created by opening the "control" device node of the
- * parent domain and issuing the KDBUS_CMD_NS_MAKE iotcl. Closing this
+ * parent domain and issuing the KDBUS_CMD_DOMAIN_MAKE iotcl. Closing this
  * file immediately destroys the entire domain.
  */
 struct kdbus_domain {
diff --git a/handle.c b/handle.c
index 5bc4ebe926a..fa6ecf94596 100644
--- a/handle.c
+++ b/handle.c
@@ -41,7 +41,7 @@
  * enum kdbus_handle_type - type a handle can be of
  * @_KDBUS_HANDLE_NULL:			Uninitialized/invalid
  * @KDBUS_HANDLE_CONTROL:		New file descriptor of a control node
- * @KDBUS_HANDLE_CONTROL_NS_OWNER:	File descriptor to hold a domain
+ * @KDBUS_HANDLE_CONTROL_DOMAIN_OWNER:	File descriptor to hold a domain
  * @KDBUS_HANDLE_CONTROL_BUS_OWNER:	File descriptor to hold a bus
  * @KDBUS_HANDLE_EP:			New file descriptor of a bus node
  * @KDBUS_HANDLE_EP_CONNECTED:		A bus connection after HELLO
@@ -51,7 +51,7 @@
 enum kdbus_handle_type {
 	_KDBUS_HANDLE_NULL,
 	KDBUS_HANDLE_CONTROL,
-	KDBUS_HANDLE_CONTROL_NS_OWNER,
+	KDBUS_HANDLE_CONTROL_DOMAIN_OWNER,
 	KDBUS_HANDLE_CONTROL_BUS_OWNER,
 	KDBUS_HANDLE_EP,
 	KDBUS_HANDLE_EP_CONNECTED,
@@ -67,7 +67,7 @@ enum kdbus_handle_type {
  * @ep:		The endpoint this handle owns, in case @type
  *		is KDBUS_HANDLE_EP
  * @domain_owner:	The domain this handle owns, in case @type
- *		is KDBUS_HANDLE_CONTROL_NS_OWNER
+ *		is KDBUS_HANDLE_CONTROL_DOMAIN_OWNER
  * @bus_owner:	The bus this handle owns, in case @type
  *		is KDBUS_HANDLE_CONTROL_BUS_OWNER
  * @ep_owner	The endpoint this handle owns, in case @type
@@ -159,7 +159,7 @@ static int kdbus_handle_release(struct inode *inode, struct file *file)
 	struct kdbus_handle *handle = file->private_data;
 
 	switch (handle->type) {
-	case KDBUS_HANDLE_CONTROL_NS_OWNER:
+	case KDBUS_HANDLE_CONTROL_DOMAIN_OWNER:
 		kdbus_domain_disconnect(handle->domain_owner);
 		kdbus_domain_unref(handle->domain_owner);
 		break;
@@ -361,7 +361,7 @@ static long kdbus_handle_ioctl_control(struct file *file, unsigned int cmd,
 		break;
 	}
 
-	case KDBUS_CMD_NS_MAKE: {
+	case KDBUS_CMD_DOMAIN_MAKE: {
 		char *name;
 
 		if (!capable(CAP_IPC_OWNER)) {
@@ -393,7 +393,7 @@ static long kdbus_handle_ioctl_control(struct file *file, unsigned int cmd,
 			break;
 
 		/* turn the control fd into a new domain owner device */
-		handle->type = KDBUS_HANDLE_CONTROL_NS_OWNER;
+		handle->type = KDBUS_HANDLE_CONTROL_DOMAIN_OWNER;
 		handle->domain_owner = domain;
 		break;
 	}
diff --git a/kdbus.h b/kdbus.h
index d2d73588d68..c9a89401597 100644
--- a/kdbus.h
+++ b/kdbus.h
@@ -598,7 +598,7 @@ enum kdbus_make_flags {
  * @items:		Items describing details
  *
  * This structure is used with the KDBUS_CMD_BUS_MAKE, KDBUS_CMD_EP_MAKE and
- * KDBUS_CMD_NS_MAKE ioctls.
+ * KDBUS_CMD_DOMAIN_MAKE ioctls.
  */
 struct kdbus_cmd_make {
 	__u64 size;
@@ -781,7 +781,7 @@ struct kdbus_cmd_memfd_make {
  *				name. The bus is immediately shut down and
  *				cleaned up when the opened "control" device node
  *				is closed.
- * @KDBUS_CMD_NS_MAKE:		Similar to KDBUS_CMD_BUS_MAKE, but it creates a
+ * @KDBUS_CMD_DOMAIN_MAKE:		Similar to KDBUS_CMD_BUS_MAKE, but it creates a
  *				new kdbus domain.
  * @KDBUS_CMD_EP_MAKE:		Creates a new named special endpoint to talk to
  *				the bus. Such endpoints usually carry a more
@@ -853,7 +853,7 @@ struct kdbus_cmd_memfd_make {
  */
 enum kdbus_ioctl_type {
 	KDBUS_CMD_BUS_MAKE =		_IOW (KDBUS_IOC_MAGIC, 0x00, struct kdbus_cmd_make),
-	KDBUS_CMD_NS_MAKE =		_IOW (KDBUS_IOC_MAGIC, 0x10, struct kdbus_cmd_make),
+	KDBUS_CMD_DOMAIN_MAKE =		_IOW (KDBUS_IOC_MAGIC, 0x10, struct kdbus_cmd_make),
 	KDBUS_CMD_EP_MAKE =		_IOW (KDBUS_IOC_MAGIC, 0x20, struct kdbus_cmd_make),
 
 	KDBUS_CMD_HELLO =		_IOWR(KDBUS_IOC_MAGIC, 0x30, struct kdbus_cmd_hello),
diff --git a/kdbus.txt b/kdbus.txt
index da0a72278c0..68cab0ca36c 100644
--- a/kdbus.txt
+++ b/kdbus.txt
@@ -171,7 +171,7 @@ domain contains a "control" device node which allows to create a new bus or
 domain. New domains do not have any buses created by default.
 
 Opening the control device node returns a file descriptor, it accepts the
-ioctls KDBUS_CMD_BUS_MAKE/KDBUS_CMD_NS_MAKE which specify the name of the new
+ioctls KDBUS_CMD_BUS_MAKE/KDBUS_CMD_DOMAIN_MAKE which specify the name of the new
 bus or domain to create. The control file descriptor needs to be kept open
 for the entire life-time of the created bus or domain, closing it will
 immediately cleanup the entire bus or domain and all its associated
diff --git a/test/kdbus-enum.c b/test/kdbus-enum.c
index 3dffc83e44a..7b111f2ed62 100644
--- a/test/kdbus-enum.c
+++ b/test/kdbus-enum.c
@@ -37,7 +37,7 @@ struct kdbus_enum_table {
 
 TABLE(CMD) = {
 	ENUM(KDBUS_CMD_BUS_MAKE),
-	ENUM(KDBUS_CMD_NS_MAKE),
+	ENUM(KDBUS_CMD_DOMAIN_MAKE),
 	ENUM(KDBUS_CMD_EP_MAKE),
 	ENUM(KDBUS_CMD_HELLO),
 	ENUM(KDBUS_CMD_MSG_SEND),
diff --git a/test/test-kdbus-fuzz.c b/test/test-kdbus-fuzz.c
index 3eba7d6957e..308f2e7ddce 100644
--- a/test/test-kdbus-fuzz.c
+++ b/test/test-kdbus-fuzz.c
@@ -16,7 +16,7 @@
 
 static unsigned int ioctl_cmds[] = {
 	KDBUS_CMD_BUS_MAKE,
-	KDBUS_CMD_NS_MAKE,
+	KDBUS_CMD_DOMAIN_MAKE,
 	KDBUS_CMD_EP_MAKE,
 	KDBUS_CMD_HELLO,
 	KDBUS_CMD_MSG_SEND,
@@ -35,7 +35,7 @@ static const char *ioctl_name(unsigned int ioctl)
 	switch(ioctl) {
 	case KDBUS_CMD_BUS_MAKE:
 		return "BUS_MAKE";
-	case KDBUS_CMD_NS_MAKE:
+	case KDBUS_CMD_DOMAIN_MAKE:
 		return "NS_MAKE";
 	case KDBUS_CMD_EP_MAKE:
 		return "EP_MAKE";
diff --git a/test/test-kdbus.c b/test/test-kdbus.c
index 73816c9dcb9..6dcaecda1de 100644
--- a/test/test-kdbus.c
+++ b/test/test-kdbus.c
@@ -283,7 +283,7 @@ static int check_nsmake(struct kdbus_check_env *env)
 	snprintf(ns_make.name, sizeof(ns_make.name), "blah");
 	ns_make.n_size = KDBUS_ITEM_HEADER_SIZE + strlen(ns_make.name) + 1;
 	ns_make.head.size = sizeof(struct kdbus_cmd_make) + ns_make.n_size;
-	ret = ioctl(fd, KDBUS_CMD_NS_MAKE, &ns_make);
+	ret = ioctl(fd, KDBUS_CMD_DOMAIN_MAKE, &ns_make);
 	if (ret < 0 && errno == EPERM)
 		return CHECK_SKIP;
 	ASSERT_RETURN(ret == 0);
@@ -291,12 +291,12 @@ static int check_nsmake(struct kdbus_check_env *env)
 	ASSERT_RETURN(access("/dev/" KBUILD_MODNAME "/domain/blah/control", F_OK) == 0);
 
 	/* can't use the same fd for domain make twice */
-	ret = ioctl(fd, KDBUS_CMD_NS_MAKE, &ns_make);
+	ret = ioctl(fd, KDBUS_CMD_DOMAIN_MAKE, &ns_make);
 	ASSERT_RETURN(ret == -1 && errno == EBADFD);
 
 	/* can't register the same name twice */
 	fd2 = open("/dev/" KBUILD_MODNAME "/control", O_RDWR|O_CLOEXEC);
-	ret = ioctl(fd2, KDBUS_CMD_NS_MAKE, &ns_make);
+	ret = ioctl(fd2, KDBUS_CMD_DOMAIN_MAKE, &ns_make);
 	ASSERT_RETURN(ret == -1 && errno == EEXIST);
 	close(fd2);