r410 - in devmapper/trunk/lib: . mm

[Bastian Blank]

Author: waldi
Date: Sat Apr  7 14:37:26 2007
New Revision: 410

Removed:
   devmapper/trunk/lib/mm/abi.c
Modified:
   devmapper/trunk/lib/.exported_symbols
   devmapper/trunk/lib/Makefile.in
   devmapper/trunk/lib/libdevmapper.h
   devmapper/trunk/lib/libdm-deptree.c
   devmapper/trunk/lib/mm/dbg_malloc.c
Log:
lib
- Remove abi fixes.
- Remove mode code in deptree.


Modified: devmapper/trunk/lib/.exported_symbols
==============================================================================
--- devmapper/trunk/lib/.exported_symbols	(original)
+++ devmapper/trunk/lib/.exported_symbols	Sat Apr  7 14:37:26 2007
@@ -41,7 +41,6 @@
 dm_tree_free
 dm_tree_add_dev
 dm_tree_add_new_dev
-_dm_tree_add_new_dev_mode
 dm_tree_node_get_name
 dm_tree_node_get_uuid
 dm_tree_node_get_info
@@ -72,7 +71,6 @@
 dm_mknodes
 dm_malloc_aux
 dm_malloc_aux_debug
-dm_strdup
 dm_strdup_aux
 dm_free_aux
 dm_realloc_aux

Modified: devmapper/trunk/lib/Makefile.in
==============================================================================
--- devmapper/trunk/lib/Makefile.in	(original)
+++ devmapper/trunk/lib/Makefile.in	Sat Apr  7 14:37:26 2007
@@ -25,7 +25,6 @@
 	libdm-deptree.c \
 	libdm-string.c \
 	libdm-report.c \
-	mm/abi.c \
 	mm/dbg_malloc.c \
 	mm/pool.c \
 	$(interface)/libdm-iface.c

Modified: devmapper/trunk/lib/libdevmapper.h
==============================================================================
--- devmapper/trunk/lib/libdevmapper.h	(original)
+++ devmapper/trunk/lib/libdevmapper.h	Sat Apr  7 14:37:26 2007
@@ -243,15 +243,6 @@
 					 int clear_inactive,
 					 void *context);
 
-struct dm_tree_node *_dm_tree_add_new_dev_mode(struct dm_tree *tree,
-                                            const char *name,
-                                            const char *uuid,
-                                            uint32_t major, uint32_t minor,
-                                            uid_t uid, uid_t gid, mode_t mode,
-                                            int read_only,
-                                            int clear_inactive,
-                                            void *context);
-
 /*
  * Search for a node in the tree.
  * Set major and minor to 0 or uuid to NULL to get the root node.

Modified: devmapper/trunk/lib/libdm-deptree.c
==============================================================================
--- devmapper/trunk/lib/libdm-deptree.c	(original)
+++ devmapper/trunk/lib/libdm-deptree.c	Sat Apr  7 14:37:26 2007
@@ -94,9 +94,6 @@
 	int read_only;
 	uint32_t major;
 	uint32_t minor;
-	uid_t uid;
-	gid_t gid;
-	mode_t mode;
 
 	unsigned segment_count;
 	struct list segs;
@@ -457,8 +454,7 @@
 
 static struct dm_tree_node *_add_dev(struct dm_tree *dtree,
 				     struct dm_tree_node *parent,
-				     uint32_t major, uint32_t minor,
-				     uid_t uid, gid_t gid, mode_t mode)
+				     uint32_t major, uint32_t minor)
 {
 	struct dm_task *dmt = NULL;
 	struct dm_info info;
@@ -501,7 +497,7 @@
 	/* Add dependencies to tree */
 	for (i = 0; i < deps->count; i++)
 		if (!_add_dev(dtree, node, MAJOR(deps->device[i]),
-			      MINOR(deps->device[i]), uid, gid, mode)) {
+			      MINOR(deps->device[i]))) {
 			node = NULL;
 			goto_out;
 		}
@@ -570,18 +566,6 @@
 					    int clear_inactive,
 					    void *context)
 {
-	return _dm_tree_add_new_dev_mode(dtree, name, uuid, major, minor, DEVICE_UID, DEVICE_GID, DEVICE_MODE, read_only, clear_inactive, context);
-}
-
-struct dm_tree_node *_dm_tree_add_new_dev_mode(struct dm_tree *dtree,
-					    const char *name,
-					    const char *uuid,
-					    uint32_t major, uint32_t minor,
-					    uid_t uid, gid_t gid, mode_t mode,
-					    int read_only,
-					    int clear_inactive,
-					    void *context)
-{
 	struct dm_tree_node *dnode;
 	struct dm_info info;
 	const char *name2;
@@ -615,9 +599,6 @@
 
 		dnode->props.major = major;
 		dnode->props.minor = minor;
-                dnode->props.uid = uid;
-                dnode->props.gid = gid;
-                dnode->props.mode = mode;
 		dnode->props.new_name = NULL;
 	} else if (strcmp(name, dnode->name)) {
 		/* Do we need to rename node? */
@@ -639,7 +620,7 @@
 
 int dm_tree_add_dev(struct dm_tree *dtree, uint32_t major, uint32_t minor)
 {
-	return _add_dev(dtree, &dtree->root, major, minor, DEVICE_UID, DEVICE_GID, DEVICE_MODE) ? 1 : 0;
+	return _add_dev(dtree, &dtree->root, major, minor) ? 1 : 0;
 }
 
 const char *dm_tree_node_get_name(struct dm_tree_node *node)
@@ -1201,12 +1182,6 @@
 		goto out;
 	}
 
-	if (!dm_task_set_uid(dmt, dnode->props.uid) ||
-	    !dm_task_set_gid(dmt, dnode->props.gid) ||
-	    !dm_task_set_mode(dmt, dnode->props.mode)) {
-		log_error("Failed to set device permissions for %s creation.", dnode->name);
-		goto out;
-	}
 	if (dnode->props.read_only && !dm_task_set_ro(dmt)) {
 		log_error("Failed to set read only flag for %s", dnode->name);
 		goto out;
@@ -1830,7 +1805,7 @@
 		}
 
 		/* FIXME Check correct macro use */
-		if (!(dev_node = _add_dev(node->dtree, node, MAJOR(info.st_rdev), MINOR(info.st_rdev), DEVICE_UID, DEVICE_GID, DEVICE_MODE)))
+		if (!(dev_node = _add_dev(node->dtree, node, MAJOR(info.st_rdev), MINOR(info.st_rdev))))
 			return_0;
 	}
 

Modified: devmapper/trunk/lib/mm/dbg_malloc.c
==============================================================================
--- devmapper/trunk/lib/mm/dbg_malloc.c	(original)
+++ devmapper/trunk/lib/mm/dbg_malloc.c	Sat Apr  7 14:37:26 2007
@@ -18,12 +18,6 @@
 #include <assert.h>
 #include <stdarg.h>
 
-char *dm_strdup_real(const char *str);
-char *dm_strdup_real(const char *str)
-{
-	return dm_strdup(str);
-}
-
 char *dm_strdup_aux(const char *str, const char *file, int line)
 {
 	char *ret;