scripts/cfs_start_volume.py xlators/features

Jeff Darcy jdarcy at fedoraproject.org
Wed Jun 8 14:17:15 UTC 2011


 scripts/cfs_start_volume.py          |    2 +-
 xlators/features/uidmap/src/uidmap.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4677605356ac4127fd7da45b40b2e1c537320ad8
Author: Kaleb S. KEITHLEY <kkeithle at cloudfs-node01.kkeithle.redhat.com>
Date:   Wed Jun 8 10:07:20 2011 -0400

    scripts/cfs_start_volume.py: using FQ path to lib seems like it's not
        agnostic wrt packaging differences, i.e. gluster packaging vs.
        fedora packaging.
    xlators/feators/uidmap/src/uidmap.c: fix a bug and eliminate the compile-
        time warning for call to gf_asprintf(). Namely arg 1 is a char**,
        not char*.

diff --git a/scripts/cfs_start_volume.py b/scripts/cfs_start_volume.py
index 70918db..1c60935 100755
--- a/scripts/cfs_start_volume.py
+++ b/scripts/cfs_start_volume.py
@@ -128,7 +128,7 @@ def cloudify_server (input, output, users, port):
 	last.subvols = []
 	for user, pw in users:
 		uidmap_opts[user] = dict()
-		uidmap_opts[user]["uidmap-plugin"] = "/usr/lib64/glusterfs/3.1.3git/xlator/features/libmaprbtree.so"
+		uidmap_opts[user]["uidmap-plugin"] = "libmaprbtree.so"
 		uidmap_opts[user]["uid-range"] = "%d-%d" % (uid_base, uid_base + uid_incr - 1)
 		uidmap_opts[user]["gid-range"] = "%d-%d" % (gid_base, gid_base + uid_incr - 1)
 		uid_base = uid_base + uid_incr
diff --git a/xlators/features/uidmap/src/uidmap.c b/xlators/features/uidmap/src/uidmap.c
index d675d54..550314f 100644
--- a/xlators/features/uidmap/src/uidmap.c
+++ b/xlators/features/uidmap/src/uidmap.c
@@ -1844,7 +1844,7 @@ uidmap_loadsharedlib(char* xltrname, char *libname)
 		plugin_path = libname;
 	}
 	else {
-		ret = gf_asprintf(plugin_path,"%s/%s",UIDMAP_PLUGIN_DIR,
+		ret = gf_asprintf(&plugin_path, "%s/%s", UIDMAP_PLUGIN_DIR,
 				  libname);
 		if (ret < 0) {
 			gf_log(xltrname,GF_LOG_ERROR,




More information about the cloudfs-devel mailing list