Permalink
Browse files

more namespace -> domain renames

  • Loading branch information...
1 parent 5e1cc5d commit 40b7b3def24b63022d1dcaf706bda7c2fc7c313e @zonque zonque committed Feb 1, 2014
Showing with 19 additions and 19 deletions.
  1. +3 −3 bus.h
  2. +7 −7 domain.c
  3. +5 −5 domain.h
  4. +1 −1 handle.c
  5. +1 −1 message.h
  6. +1 −1 metadata.c
  7. +1 −1 metadata.h
View
6 bus.h
@@ -23,7 +23,7 @@
* @kref: Reference count
* @disconnected: Invalidated data
* @uid_owner: The uid of the owner of the bus
- * @domain: Namespace of this bus
+ * @domain: Domain of this bus
* @name: The bus name
* @id: ID of this bus in the domain
* @lock: Bus data lock
@@ -33,8 +33,8 @@
* @conn_hash: Map of connection IDs
* @ep_list: Endpoints on this bus
* @bus_flags: Simple pass-through flags from userspace to userspace
- * @name_registry: Namespace's list of buses
- * @domain_entry: Namespace's list of buses
+ * @name_registry: Domain's list of buses
+ * @domain_entry: Domain's list of buses
* @monitors_list: Connections that monitor this bus
* @bloom: Bloom parameters
* @id128: Unique random 128 bit ID of this bus
View
@@ -26,7 +26,7 @@
#include "domain.h"
#include "util.h"
-/* map of majors to namespaces */
+/* map of majors to domains */
static DEFINE_IDR(kdbus_domain_major_idr);
/* next domain id sequence number */
@@ -68,7 +68,7 @@ static struct device_type kdbus_devtype_control = {
/**
* kdbus_domain_ref() - take a domain reference
- * @domain: Namespace
+ * @domain: Domain
*
* Return: the domain itself
*/
@@ -80,7 +80,7 @@ struct kdbus_domain *kdbus_domain_ref(struct kdbus_domain *domain)
/**
* kdbus_domain_disconnect() - invalidate a domain
- * @domain: Namespace
+ * @domain: Domain
*/
void kdbus_domain_disconnect(struct kdbus_domain *domain)
{
@@ -131,7 +131,7 @@ static void __kdbus_domain_free(struct kref *kref)
/**
* kdbus_domain_unref() - drop a domain reference
- * @domain: Namespace
+ * @domain: Domain
*
* When the last reference is dropped, the domain internal structure
* is freed.
@@ -153,7 +153,7 @@ static struct kdbus_domain *kdbus_domain_find(struct kdbus_domain const *parent,
struct kdbus_domain *domain = NULL;
struct kdbus_domain *n;
- list_for_each_entry(n, &parent->ns_list, domain_entry) {
+ list_for_each_entry(n, &parent->domain_list, domain_entry) {
if (strcmp(n->name, name))
continue;
@@ -212,7 +212,7 @@ int kdbus_domain_new(struct kdbus_domain *parent, const char *name,
return -ENOMEM;
INIT_LIST_HEAD(&n->bus_list);
- INIT_LIST_HEAD(&n->ns_list);
+ INIT_LIST_HEAD(&n->domain_list);
kref_init(&n->kref);
n->mode = mode;
idr_init(&n->idr);
@@ -296,7 +296,7 @@ int kdbus_domain_new(struct kdbus_domain *parent, const char *name,
/* link into parent domain */
if (parent) {
n->parent = kdbus_domain_ref(parent);
- list_add_tail(&n->domain_entry, &parent->ns_list);
+ list_add_tail(&n->domain_entry, &parent->domain_list);
}
mutex_unlock(&kdbus_subsys_lock);
View
@@ -17,19 +17,19 @@
#include <linux/idr.h>
/**
- * struct kdbus_namespace - domain for buses
+ * struct kdbus_domain - domain for buses
* @kref: Reference counter
* @disconnected: Invalidated data
* @name: Name of the domain
* @parent: Parent domain
- * @ns_list: List of child namespaces
+ * @domain_list: List of child domains
* @id: Global id of this domain
* @devpath: /dev base directory path
* @major: Device major number for all nodes
* @mode: Device node access mode
* @idr: Map of endpoint minors to buses
* @dev: Control device node, minor == 0
- * @lock: Namespace data lock
+ * @lock: Domain data lock
* @bus_seq_last: Last used bus id sequence number
* @msg_seq_last: Last used message id sequence number
* @domain_entry: Entry in parent domain
@@ -51,7 +51,7 @@ struct kdbus_domain {
bool disconnected;
const char *name;
struct kdbus_domain *parent;
- struct list_head ns_list;
+ struct list_head domain_list;
u64 id;
const char *devpath;
unsigned int major;
@@ -69,7 +69,7 @@ struct kdbus_domain {
/**
* struct kdbus_domain_user - resource accounting for users
* @kref: Reference counter
- * @domain: Namespace of the user
+ * @domain: Domain of the user
* @hentry: Entry in domain user map
* @uid: UID of the user
* @buses: Number of buses the user has created
View
@@ -62,7 +62,7 @@ enum kdbus_handle_type {
/**
* struct kdbus_handle - a handle to the kdbus system
* @type: Type of this handle (KDBUS_HANDLE_*)
- * @domain: Namespace for this handle
+ * @domain: Domain for this handle
* @meta: Cached connection creator's metadata/credentials
* @ep: The endpoint this handle owns, in case @type
* is KDBUS_HANDLE_EP
View
@@ -18,7 +18,7 @@
/**
* struct kdbus_kmsg - internal message handling data
- * @seq: Namespace-global message sequence number
+ * @seq: Domain-global message sequence number
* @notify_type: Short-cut for faster lookup
* @notify_old_id: Short-cut for faster lookup
* @notify_new_id: Short-cut for faster lookup
View
@@ -48,7 +48,7 @@ int kdbus_meta_new(struct kdbus_meta **meta)
/*
* Remember the PID domain our credentials belong to; we
* need to prevent leaking authorization and security-relevant
- * data across different namespaces.
+ * data across different domains.
*/
m->domain = task_active_pid_ns(current);
View
@@ -16,7 +16,7 @@
/**
* struct kdbus_meta - metadata buffer
* @attached: Flags for already attached data
- * @domain: Namespace the metadata belongs to
+ * @domain: Domain the metadata belongs to
* @data: Allocated buffer
* @size: Number of bytes used
* @allocated_size: Size of buffer

0 comments on commit 40b7b3d

Please sign in to comment.