b=16721

[fs/lustre-release.git] / lustre / mdt / mdt_identity.c

diff --git a/lustre/mdt/mdt_identity.c b/lustre/mdt/mdt_identity.c
index 36a698f..f7b1658 100644 (file)
--- a/lustre/mdt/mdt_identity.c
+++ b/lustre/mdt/mdt_identity.c
@@ -16,8 +16,8 @@
  * in the LICENSE file that accompanied this code).
  *
  * You should have received a copy of the GNU General Public License
- * version 2 along with this program; If not, see [sun.com URL with a
- * copy of GPLv2].
+ * version 2 along with this program; If not, see
+ * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
  *
  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  * CA 95054 USA or visit www.sun.com if you need additional information or
@@ -87,7 +87,7 @@ static void mdt_identity_entry_free(struct upcall_cache *cache,
         struct md_identity *identity = &entry->u.identity;
 
         if (identity->mi_ginfo) {
-                groups_free(identity->mi_ginfo);
+                put_group_info(identity->mi_ginfo);
                 identity->mi_ginfo = NULL;
         }
 
@@ -138,7 +138,7 @@ static int mdt_identity_do_upcall(struct upcall_cache *cache,
 
         snprintf(keystr, sizeof(keystr), LPU64, entry->ue_key);
 
-        CDEBUG(D_INFO, "The upcall is: %s \n", cache->uc_upcall);
+        CDEBUG(D_INFO, "The upcall is: '%s'\n", cache->uc_upcall);
 
         rc = USERMODEHELPER(argv[0], argv, envp);
         if (rc < 0) {
@@ -187,7 +187,7 @@ static int mdt_identity_parse_downcall(struct upcall_cache *cache,
                 if (!perms) {
                         CERROR("failed to alloc %d permissions\n",
                                data->idd_nperms);
-                        groups_free(ginfo);
+                        put_group_info(ginfo);
                         RETURN(-ENOMEM);
                 }
 
@@ -285,10 +285,8 @@ __u32 mdt_identity_get_perm(struct md_identity *identity,
 int mdt_pack_remote_perm(struct mdt_thread_info *info, struct mdt_object *o,
                          void *buf)
 {
-        struct ptlrpc_request   *req = mdt_info_req(info);
         struct md_ucred         *uc = mdt_ucred(info);
         struct md_object        *next = mdt_object_child(o);
-        struct mdt_export_data  *med = mdt_req2med(req);
         struct mdt_remote_perm  *perm = buf;
 
         ENTRY;
@@ -296,7 +294,7 @@ int mdt_pack_remote_perm(struct mdt_thread_info *info, struct mdt_object *o,
         /* remote client request always pack ptlrpc_user_desc! */
         LASSERT(perm);
 
-        if (!med->med_rmtclient)
+        if (!exp_connect_rmtclient(info->mti_exp))
                 RETURN(-EBADE);
 
         if ((uc->mu_valid != UCRED_OLD) && (uc->mu_valid != UCRED_NEW))