X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fmdt%2Fmdt_identity.c;h=595a6d052464b1459597a2ba14324a700f9d2fe9;hb=aa40787eee1835e4f84a40caa96fb232354bd799;hp=e7e76b0d4483de8b51bca795d574a9555a460cd0;hpb=08aa217ce49aba1ded52e0f7adb8a607035123fd;p=fs%2Flustre-release.git

diff --git a/lustre/mdt/mdt_identity.c b/lustre/mdt/mdt_identity.c
index e7e76b0..595a6d0 100644
--- a/lustre/mdt/mdt_identity.c
+++ b/lustre/mdt/mdt_identity.c
@@ -57,7 +57,6 @@
 #include <linux/slab.h>
 
 #include <libcfs/libcfs.h>
-#include <libcfs/lucache.h>
 #include <obd.h>
 #include <obd_class.h>
 #include <obd_support.h>
@@ -75,21 +74,21 @@ static void mdt_identity_entry_init(struct upcall_cache_entry *entry,
 }
 
 static void mdt_identity_entry_free(struct upcall_cache *cache,
-                                    struct upcall_cache_entry *entry)
+				    struct upcall_cache_entry *entry)
 {
-        struct md_identity *identity = &entry->u.identity;
-
-        if (identity->mi_ginfo) {
-                cfs_put_group_info(identity->mi_ginfo);
-                identity->mi_ginfo = NULL;
-        }
-
-        if (identity->mi_nperms) {
-                LASSERT(identity->mi_perms);
-                OBD_FREE(identity->mi_perms,
-                         identity->mi_nperms * sizeof(struct md_perm));
-                identity->mi_nperms = 0;
-        }
+	struct md_identity *identity = &entry->u.identity;
+
+	if (identity->mi_ginfo) {
+		put_group_info(identity->mi_ginfo);
+		identity->mi_ginfo = NULL;
+	}
+
+	if (identity->mi_nperms) {
+		LASSERT(identity->mi_perms);
+		OBD_FREE(identity->mi_perms,
+			 identity->mi_nperms * sizeof(struct md_perm));
+		identity->mi_nperms = 0;
+	}
 }
 
 static int mdt_identity_do_upcall(struct upcall_cache *cache,
@@ -125,10 +124,10 @@ static int mdt_identity_do_upcall(struct upcall_cache *cache,
         argv[0] = cache->uc_upcall;
         snprintf(keystr, sizeof(keystr), LPU64, entry->ue_key);
 
-        cfs_gettimeofday(&start);
-        rc = USERMODEHELPER(argv[0], argv, envp);
-        cfs_gettimeofday(&end);
-        if (rc < 0) {
+	do_gettimeofday(&start);
+	rc = call_usermodehelper(argv[0], argv, envp, UMH_WAIT_EXEC);
+	do_gettimeofday(&end);
+	if (rc < 0) {
                 CERROR("%s: error invoking upcall %s %s %s: rc %d; "
                        "check /proc/fs/lustre/mdt/%s/identity_upcall, "
                        "time %ldus\n",
@@ -147,59 +146,59 @@ out:
 }
 
 static int mdt_identity_parse_downcall(struct upcall_cache *cache,
-                                       struct upcall_cache_entry *entry,
-                                       void *args)
+				       struct upcall_cache_entry *entry,
+				       void *args)
 {
-        struct md_identity *identity = &entry->u.identity;
-        struct identity_downcall_data *data = args;
-        cfs_group_info_t *ginfo = NULL;
-        struct md_perm *perms = NULL;
-        int size, i;
-        ENTRY;
-
-        LASSERT(data);
-        if (data->idd_ngroups > NGROUPS_MAX)
-                RETURN(-E2BIG);
-
-        if (data->idd_ngroups > 0) {
-                ginfo = cfs_groups_alloc(data->idd_ngroups);
-                if (!ginfo) {
-                        CERROR("failed to alloc %d groups\n", data->idd_ngroups);
-                        RETURN(-ENOMEM);
-                }
-
-                lustre_groups_from_list(ginfo, data->idd_groups);
-                lustre_groups_sort(ginfo);
-        }
-
-        if (data->idd_nperms) {
-                size = data->idd_nperms * sizeof(*perms);
-                OBD_ALLOC(perms, size);
-                if (!perms) {
-                        CERROR("failed to alloc %d permissions\n",
-                               data->idd_nperms);
-                        if (ginfo != NULL)
-                                cfs_put_group_info(ginfo);
-                        RETURN(-ENOMEM);
-                }
-
-                for (i = 0; i < data->idd_nperms; i++) {
-                        perms[i].mp_nid = data->idd_perms[i].pdd_nid;
-                        perms[i].mp_perm = data->idd_perms[i].pdd_perm;
-                }
-        }
-
-        identity->mi_uid = data->idd_uid;
-        identity->mi_gid = data->idd_gid;
-        identity->mi_ginfo = ginfo;
-        identity->mi_nperms = data->idd_nperms;
-        identity->mi_perms = perms;
-
-        CDEBUG(D_OTHER, "parse mdt identity@%p: %d:%d, ngroups %u, nperms %u\n",
-               identity, identity->mi_uid, identity->mi_gid,
-               data->idd_ngroups, data->idd_nperms);
-
-        RETURN(0);
+	struct md_identity *identity = &entry->u.identity;
+	struct identity_downcall_data *data = args;
+	struct group_info *ginfo = NULL;
+	struct md_perm *perms = NULL;
+	int size, i;
+	ENTRY;
+
+	LASSERT(data);
+	if (data->idd_ngroups > NGROUPS_MAX)
+		RETURN(-E2BIG);
+
+	if (data->idd_ngroups > 0) {
+		ginfo = groups_alloc(data->idd_ngroups);
+		if (!ginfo) {
+			CERROR("failed to alloc %d groups\n", data->idd_ngroups);
+			RETURN(-ENOMEM);
+		}
+
+		lustre_groups_from_list(ginfo, data->idd_groups);
+		lustre_groups_sort(ginfo);
+	}
+
+	if (data->idd_nperms) {
+		size = data->idd_nperms * sizeof(*perms);
+		OBD_ALLOC(perms, size);
+		if (!perms) {
+			CERROR("failed to alloc %d permissions\n",
+			       data->idd_nperms);
+			if (ginfo != NULL)
+				put_group_info(ginfo);
+			RETURN(-ENOMEM);
+		}
+
+		for (i = 0; i < data->idd_nperms; i++) {
+			perms[i].mp_nid = data->idd_perms[i].pdd_nid;
+			perms[i].mp_perm = data->idd_perms[i].pdd_perm;
+		}
+	}
+
+	identity->mi_uid = data->idd_uid;
+	identity->mi_gid = data->idd_gid;
+	identity->mi_ginfo = ginfo;
+	identity->mi_nperms = data->idd_nperms;
+	identity->mi_perms = perms;
+
+	CDEBUG(D_OTHER, "parse mdt identity@%p: %d:%d, ngroups %u, nperms %u\n",
+	       identity, identity->mi_uid, identity->mi_gid,
+	       data->idd_ngroups, data->idd_nperms);
+
+	RETURN(0);
 }
 
 struct md_identity *mdt_identity_get(struct upcall_cache *cache, __u32 uid)