domain: kdbus_domain_user -> kdbus_user

This renames kdbus_domain_user to kdbus_user. While we tried to keep
prefixed according to the source-files they reside in, in this particular
case it just makes stuff more complex. Lets call it 'kdbus_user'.

Signed-off-by: David Herrmann <dh.herrmann@gmail.com>

bus.c

@@ -46,7 +46,7 @@ static void kdbus_bus_free(struct kdbus_node *node)
 
 	kdbus_notify_free(bus);
 
-	kdbus_domain_user_unref(bus->creator);
+	kdbus_user_unref(bus->creator);
 	kdbus_name_registry_free(bus->name_registry);
 	kdbus_domain_unref(bus->domain);
 	kdbus_policy_db_clear(&bus->policy_db);
@@ -165,7 +165,7 @@ static struct kdbus_bus *kdbus_bus_new(struct kdbus_domain *domain,
 	 * Bus-limits of the creator are accounted on its real UID, just like
 	 * all other per-user limits.
 	 */
-	b->creator = kdbus_domain_get_user(domain, current_uid());
+	b->creator = kdbus_user_lookup(domain, current_uid());
 	if (IS_ERR(b->creator)) {
 		ret = PTR_ERR(b->creator);
 		b->creator = NULL;

bus.h

@@ -29,8 +29,8 @@
 
 struct kdbus_conn;
 struct kdbus_domain;
-struct kdbus_domain_user;
 struct kdbus_kmsg;
+struct kdbus_user;
 
 /**
  * struct kdbus_bus - bus in a domain
@@ -65,7 +65,7 @@ struct kdbus_bus {
 	u8 id128[16];
 	struct kdbus_bloom_parameter bloom;
 	struct kdbus_domain *domain;
-	struct kdbus_domain_user *creator;
+	struct kdbus_user *creator;
 	struct kdbus_meta_proc *creator_meta;
 
 	/* protected by own locks */

connection.c

@@ -52,7 +52,7 @@
 #define KDBUS_CONN_ACTIVE_BIAS	(INT_MIN + 2)
 #define KDBUS_CONN_ACTIVE_NEW	(INT_MIN + 1)
 
-static int kdbus_conn_quota(struct kdbus_conn *c, struct kdbus_domain_user *u,
+static int kdbus_conn_quota(struct kdbus_conn *c, struct kdbus_user *u,
 			    size_t memory, size_t fds)
 {
 	struct kdbus_quota *quota;
@@ -233,7 +233,7 @@ static int kdbus_conn_recv(struct kdbus_conn *conn, struct kdbus_cmd_recv *recv)
 static struct kdbus_queue_entry *
 kdbus_conn_entry_make(struct kdbus_conn *conn_dst,
 		      const struct kdbus_kmsg *kmsg,
-		      struct kdbus_domain_user *user)
+		      struct kdbus_user *user)
 {
 	struct kdbus_queue_entry *entry;
 	int ret;
@@ -268,7 +268,7 @@ kdbus_conn_entry_make(struct kdbus_conn *conn_dst,
 			return ERR_PTR(ret);
 		}
 
-		entry->user = kdbus_domain_user_ref(user);
+		entry->user = kdbus_user_ref(user);
 	}
 
 	return entry;
@@ -986,7 +986,7 @@ static void __kdbus_conn_free(struct kref *kref)
 
 	if (conn->user) {
 		atomic_dec(&conn->user->connections);
-		kdbus_domain_user_unref(conn->user);
+		kdbus_user_unref(conn->user);
 	}
 
 	kdbus_meta_proc_unref(conn->meta);
@@ -1330,10 +1330,9 @@ static struct kdbus_conn *kdbus_conn_new(struct kdbus_ep *ep, bool privileged,
 	 * cred->uid, not cred->euid).
 	 */
 	if (ep->user) {
-		conn->user = kdbus_domain_user_ref(ep->user);
+		conn->user = kdbus_user_ref(ep->user);
 	} else {
-		conn->user = kdbus_domain_get_user(ep->bus->domain,
-						   current_uid());
+		conn->user = kdbus_user_lookup(ep->bus->domain, current_uid());
 		if (IS_ERR(conn->user)) {
 			ret = PTR_ERR(conn->user);
 			conn->user = NULL;

connection.h

@@ -105,7 +105,7 @@ struct kdbus_conn {
 	struct kdbus_match_db *match_db;
 	struct kdbus_meta_proc *meta;
 	struct kdbus_pool *pool;
-	struct kdbus_domain_user *user;
+	struct kdbus_user *user;
 	const struct cred *cred;
 	atomic_t name_count;
 	atomic_t request_count;

domain.c

@@ -177,21 +177,18 @@ int kdbus_domain_populate(struct kdbus_domain *domain, unsigned int access)
 }
 
 /**
- * kdbus_domain_get_user() - get a kdbus_domain_user object
- * @domain:		The domain of the user
- * @uid:		The uid of the user; INVALID_UID for an
- *			anonymous user like a custom endpoint
+ * kdbus_user_lookup() - lookup a kdbus_user object
+ * @domain:		domain of the user
+ * @uid:		uid of the user; INVALID_UID for an anon user
  *
- * If there is a uid matching, then use the already accounted
- * kdbus_domain_user, increment its reference counter and return it.
- * Otherwise allocate a new one, link it into the domain and return it.
+ * Lookup the kdbus user accounting object for the given domain. If INVALID_UID
+ * is passed, a new anonymous user is created which is private to the caller.
  *
- * Return: the accounted domain user on success, ERR_PTR on failure.
+ * Return: The user object is returned, ERR_PTR on failure.
  */
-struct kdbus_domain_user *kdbus_domain_get_user(struct kdbus_domain *domain,
-						kuid_t uid)
+struct kdbus_user *kdbus_user_lookup(struct kdbus_domain *domain, kuid_t uid)
 {
-	struct kdbus_domain_user *u = NULL, *old = NULL;
+	struct kdbus_user *u = NULL, *old = NULL;
 	int ret;
 
 	mutex_lock(&domain->lock);
@@ -256,10 +253,9 @@ struct kdbus_domain_user *kdbus_domain_get_user(struct kdbus_domain *domain,
 	return ERR_PTR(ret);
 }
 
-static void __kdbus_domain_user_free(struct kref *kref)
+static void __kdbus_user_free(struct kref *kref)
 {
-	struct kdbus_domain_user *user =
-		container_of(kref, struct kdbus_domain_user, kref);
+	struct kdbus_user *user = container_of(kref, struct kdbus_user, kref);
 
 	WARN_ON(atomic_read(&user->buses) > 0);
 	WARN_ON(atomic_read(&user->connections) > 0);
@@ -275,29 +271,26 @@ static void __kdbus_domain_user_free(struct kref *kref)
 }
 
 /**
- * kdbus_domain_user_ref() - take a domain user reference
+ * kdbus_user_ref() - take a user reference
  * @u:		User
  *
- * Return: the domain user itself
+ * Return: @u is returned
  */
-struct kdbus_domain_user *kdbus_domain_user_ref(struct kdbus_domain_user *u)
+struct kdbus_user *kdbus_user_ref(struct kdbus_user *u)
 {
 	kref_get(&u->kref);
 	return u;
 }
 
 /**
- * kdbus_domain_user_unref() - drop a domain user reference
+ * kdbus_user_unref() - drop a user reference
  * @u:		User
  *
- * When the last reference is dropped, the domain internal structure
- * is freed.
- *
  * Return: NULL
  */
-struct kdbus_domain_user *kdbus_domain_user_unref(struct kdbus_domain_user *u)
+struct kdbus_user *kdbus_user_unref(struct kdbus_user *u)
 {
 	if (u)
-		kref_put(&u->kref, __kdbus_domain_user_free);
+		kref_put(&u->kref, __kdbus_user_free);
 	return NULL;
 }

domain.h

@@ -43,15 +43,15 @@ struct kdbus_domain {
 };
 
 /**
- * struct kdbus_domain_user - resource accounting for users
+ * struct kdbus_user - resource accounting for users
  * @kref:		Reference counter
  * @domain:		Domain of the user
  * @id:			Index of this user
  * @uid:		UID of the user
  * @buses:		Number of buses the user has created
  * @connections:	Number of connections the user has created
  */
-struct kdbus_domain_user {
+struct kdbus_user {
 	struct kref kref;
 	struct kdbus_domain *domain;
 	unsigned int id;
@@ -68,9 +68,8 @@ struct kdbus_domain *kdbus_domain_ref(struct kdbus_domain *domain);
 struct kdbus_domain *kdbus_domain_unref(struct kdbus_domain *domain);
 int kdbus_domain_populate(struct kdbus_domain *domain, unsigned int access);
 
-struct kdbus_domain_user *kdbus_domain_get_user(struct kdbus_domain *domain,
-						kuid_t uid);
-struct kdbus_domain_user *kdbus_domain_user_ref(struct kdbus_domain_user *u);
-struct kdbus_domain_user *kdbus_domain_user_unref(struct kdbus_domain_user *u);
+struct kdbus_user *kdbus_user_lookup(struct kdbus_domain *domain, kuid_t uid);
+struct kdbus_user *kdbus_user_ref(struct kdbus_user *u);
+struct kdbus_user *kdbus_user_unref(struct kdbus_user *u);
 
 #endif

endpoint.c

@@ -39,7 +39,7 @@ static void kdbus_ep_free(struct kdbus_node *node)
 
 	kdbus_policy_db_clear(&ep->policy_db);
 	kdbus_bus_unref(ep->bus);
-	kdbus_domain_user_unref(ep->user);
+	kdbus_user_unref(ep->user);
 	kfree(ep);
 }
 
@@ -135,7 +135,7 @@ struct kdbus_ep *kdbus_ep_new(struct kdbus_bus *bus, const char *name,
 	 * non-custom endpoints.
 	 */
 	if (is_custom) {
-		e->user = kdbus_domain_get_user(bus->domain, INVALID_UID);
+		e->user = kdbus_user_lookup(bus->domain, INVALID_UID);
 		if (IS_ERR(e->user)) {
 			ret = PTR_ERR(e->user);
 			e->user = NULL;

endpoint.h

@@ -22,7 +22,7 @@
 #include "policy.h"
 
 struct kdbus_bus;
-struct kdbus_domain_user;
+struct kdbus_user;
 
 /**
  * struct kdbus_ep - enpoint to access a bus
@@ -43,7 +43,7 @@ struct kdbus_ep {
 
 	/* static */
 	struct kdbus_bus *bus;
-	struct kdbus_domain_user *user;
+	struct kdbus_user *user;
 
 	/* protected by own locks */
 	struct kdbus_policy_db policy_db;

main.c

@@ -30,7 +30,7 @@
  * From a mount point's (domain's) perspective:
  *
  * struct kdbus_domain
- *   |» struct kdbus_domain_user *user (many, owned)
+ *   |» struct kdbus_user *user (many, owned)
  *   '» struct kdbus_node node (embedded)
  *       |» struct kdbus_node children (many, referenced)
  *       |» struct kdbus_node *parent (pinned)
@@ -51,13 +51,13 @@
  *               |   |    '» struct kdbus_pool_slice *slices (many, owned)
  *               |   |       '» struct kdbus_pool *pool (pinned)
  *               |   |
- *               |   |» struct kdbus_domain_user *user (pinned)
+ *               |   |» struct kdbus_user *user (pinned)
  *               |   `» struct kdbus_queue_entry entries (many, embedded)
  *               |        |» struct kdbus_pool_slice *slice (pinned)
  *               |        |» struct kdbus_conn_reply *reply (owned)
- *               |        '» struct kdbus_domain_user *user (pinned)
+ *               |        '» struct kdbus_user *user (pinned)
  *               |
- *               '» struct kdbus_domain_user *user (pinned)
+ *               '» struct kdbus_user *user (pinned)
  *                   '» struct kdbus_policy_db policy_db (embedded)
  *                        |» struct kdbus_policy_db_entry (many, owned)
  *                        |   |» struct kdbus_conn (pinned)

queue.c

@@ -150,7 +150,7 @@ void kdbus_queue_entry_remove(struct kdbus_conn *conn,
 		struct kdbus_quota *quota = &conn->quota[entry->user->id];
 		size_t n;
 
-		entry->user = kdbus_domain_user_unref(entry->user);
+		entry->user = kdbus_user_unref(entry->user);
 
 		n = kdbus_pool_slice_size(entry->slice);
 		if (!WARN_ON(quota->memory < n))

queue.h

@@ -15,7 +15,7 @@
 #ifndef __KDBUS_QUEUE_H
 #define __KDBUS_QUEUE_H
 
-struct kdbus_domain_user;
+struct kdbus_user;
 
 /**
  * struct kdbus_queue - a connection's message queue
@@ -81,7 +81,7 @@ struct kdbus_queue_entry {
 	struct kdbus_meta_proc *proc_meta;
 	struct kdbus_meta_conn *conn_meta;
 	struct kdbus_reply *reply;
-	struct kdbus_domain_user *user;
+	struct kdbus_user *user;
 };
 
 struct kdbus_kmsg;