Whamcloud - gitweb
LU-3963 obdclass: convert to linux list api
[fs/lustre-release.git] / lustre / obdclass / idmap.c
index 89a00b9..df6c57b 100644 (file)
@@ -1,6 +1,4 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
  * GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * GPL HEADER END
  */
 /*
- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2012, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  * Author: Fan Yong <fanyong@clusterfs.com>
  */
 
-#ifndef EXPORT_SYMTAB
-# define EXPORT_SYMTAB
-#endif
-
 #define DEBUG_SUBSYSTEM S_SEC
 
+#include <libcfs/lucache.h>
+
 #include <lustre_idmap.h>
+#include <md_object.h>
 #include <obd_support.h>
 
 #define lustre_get_group_info(group_info) do {             \
-        atomic_inc(&(group_info)->usage);                  \
+       atomic_inc(&(group_info)->usage);              \
 } while (0)
 
 #define lustre_put_group_info(group_info) do {             \
-        if (atomic_dec_and_test(&(group_info)->usage))     \
-                groups_free(group_info);                   \
+       if (atomic_dec_and_test(&(group_info)->usage)) \
+               groups_free(group_info);                   \
 } while (0)
 
 /*
  * groups_search() is copied from linux kernel!
  * A simple bsearch.
  */
-static int lustre_groups_search(struct group_info *group_info, gid_t grp)
+static int lustre_groups_search(struct group_info *group_info,
+                               gid_t grp)
 {
-        int left, right;
-
-        if (!group_info)
-                return 0;
-
-        left = 0;
-        right = group_info->ngroups;
-        while (left < right) {
-                int mid = (left + right) / 2;
-                int cmp = grp - CFS_GROUP_AT(group_info, mid);
-
-                if (cmp > 0)
-                        left = mid + 1;
-                else if (cmp < 0)
-                        right = mid;
-                else
-                        return 1;
-        }
-        return 0;
+       int left, right;
+
+       if (!group_info)
+               return 0;
+
+       left = 0;
+       right = group_info->ngroups;
+       while (left < right) {
+               int mid = (left + right) / 2;
+               int cmp = grp -
+                       from_kgid(&init_user_ns, CFS_GROUP_AT(group_info, mid));
+
+               if (cmp > 0)
+                       left = mid + 1;
+               else if (cmp < 0)
+                       right = mid;
+               else
+                       return 1;
+       }
+       return 0;
 }
 
 void lustre_groups_from_list(struct group_info *ginfo, gid_t *glist)
 {
-        int i;
-        int count = ginfo->ngroups;
-
-        /* fill group_info from gid array */
-        for (i = 0; i < ginfo->nblocks && count > 0; i++) {
-                int cp_count = min(CFS_NGROUPS_PER_BLOCK, count);
-                int off = i * CFS_NGROUPS_PER_BLOCK;
-                int len = cp_count * sizeof(*glist);
-
-                memcpy(ginfo->blocks[i], glist + off, len);
-                count -= cp_count;
-        }
+       int i;
+       int count = ginfo->ngroups;
+
+       /* fill group_info from gid array */
+       for (i = 0; i < ginfo->nblocks && count > 0; i++) {
+               int cp_count = min(CFS_NGROUPS_PER_BLOCK, count);
+               int off = i * CFS_NGROUPS_PER_BLOCK;
+               int len = cp_count * sizeof(*glist);
+
+               memcpy(ginfo->blocks[i], glist + off, len);
+               count -= cp_count;
+       }
 }
 EXPORT_SYMBOL(lustre_groups_from_list);
 
@@ -113,61 +114,64 @@ void lustre_groups_sort(struct group_info *group_info)
                 ; /* nothing */
         stride /= 3;
 
-        while (stride) {
-                max = gidsetsize - stride;
-                for (base = 0; base < max; base++) {
-                        int left = base;
-                        int right = left + stride;
-                        gid_t tmp = CFS_GROUP_AT(group_info, right);
-
-                        while (left >= 0 &&
-                               CFS_GROUP_AT(group_info, left) > tmp) {
-                                CFS_GROUP_AT(group_info, right) =
-                                    CFS_GROUP_AT(group_info, left);
-                                right = left;
-                                left -= stride;
-                        }
-                        CFS_GROUP_AT(group_info, right) = tmp;
-                }
-                stride /= 3;
-        }
+       while (stride) {
+               max = gidsetsize - stride;
+               for (base = 0; base < max; base++) {
+                       int left = base;
+                       int right = left + stride;
+                       gid_t tmp = from_kgid(&init_user_ns,
+                                             CFS_GROUP_AT(group_info, right));
+
+                       while (left >= 0 &&
+                              tmp < from_kgid(&init_user_ns,
+                                              CFS_GROUP_AT(group_info, left))) {
+                               CFS_GROUP_AT(group_info, right) =
+                                       CFS_GROUP_AT(group_info, left);
+                               right = left;
+                               left -= stride;
+                       }
+                       CFS_GROUP_AT(group_info, right) =
+                                               make_kgid(&init_user_ns, tmp);
+               }
+               stride /= 3;
+       }
 }
 EXPORT_SYMBOL(lustre_groups_sort);
 
-int lustre_in_group_p(struct md_ucred *mu, gid_t grp)
+int lustre_in_group_p(struct lu_ucred *mu, gid_t grp)
 {
-        int rc = 1;
-
-        if (grp != mu->mu_fsgid) {
-                struct group_info *group_info = NULL;
-
-                if (mu->mu_ginfo || !mu->mu_identity ||
-                    mu->mu_valid == UCRED_OLD)
-                        if (grp == mu->mu_suppgids[0] ||
-                            grp == mu->mu_suppgids[1])
-                                return 1;
-
-                if (mu->mu_ginfo)
-                        group_info = mu->mu_ginfo;
-                else if (mu->mu_identity)
-                        group_info = mu->mu_identity->mi_ginfo;
-
-                if (!group_info)
-                        return 0;
-
-                lustre_get_group_info(group_info);
-                rc = lustre_groups_search(group_info, grp);
-                lustre_put_group_info(group_info);
-        }
-        return rc;
+       int rc = 1;
+
+       if (grp != mu->uc_fsgid) {
+               struct group_info *group_info = NULL;
+
+               if (mu->uc_ginfo || !mu->uc_identity ||
+                   mu->uc_valid == UCRED_OLD)
+                       if (grp == mu->uc_suppgids[0] ||
+                           grp == mu->uc_suppgids[1])
+                               return 1;
+
+               if (mu->uc_ginfo)
+                       group_info = mu->uc_ginfo;
+               else if (mu->uc_identity)
+                       group_info = mu->uc_identity->mi_ginfo;
+
+               if (!group_info)
+                       return 0;
+
+               lustre_get_group_info(group_info);
+               rc = lustre_groups_search(group_info, grp);
+               lustre_put_group_info(group_info);
+       }
+       return rc;
 }
 EXPORT_SYMBOL(lustre_in_group_p);
 
 struct lustre_idmap_entry {
-        struct list_head lie_rmt_uid_hash; /* hashed as lie_rmt_uid; */
-        struct list_head lie_lcl_uid_hash; /* hashed as lie_lcl_uid; */
-        struct list_head lie_rmt_gid_hash; /* hashed as lie_rmt_gid; */
-        struct list_head lie_lcl_gid_hash; /* hashed as lie_lcl_gid; */
+       struct list_head       lie_rmt_uid_hash; /* hashed as lie_rmt_uid; */
+       struct list_head       lie_lcl_uid_hash; /* hashed as lie_lcl_uid; */
+       struct list_head       lie_rmt_gid_hash; /* hashed as lie_rmt_gid; */
+       struct list_head       lie_lcl_gid_hash; /* hashed as lie_lcl_gid; */
         uid_t            lie_rmt_uid;      /* remote uid */
         uid_t            lie_lcl_uid;      /* local uid */
         gid_t            lie_rmt_gid;      /* remote gid */
@@ -189,10 +193,10 @@ struct lustre_idmap_entry *idmap_entry_alloc(uid_t rmt_uid, uid_t lcl_uid,
         if (e == NULL)
                 return NULL;
 
-        CFS_INIT_LIST_HEAD(&e->lie_rmt_uid_hash);
-        CFS_INIT_LIST_HEAD(&e->lie_lcl_uid_hash);
-        CFS_INIT_LIST_HEAD(&e->lie_rmt_gid_hash);
-        CFS_INIT_LIST_HEAD(&e->lie_lcl_gid_hash);
+       INIT_LIST_HEAD(&e->lie_rmt_uid_hash);
+       INIT_LIST_HEAD(&e->lie_lcl_uid_hash);
+       INIT_LIST_HEAD(&e->lie_rmt_gid_hash);
+       INIT_LIST_HEAD(&e->lie_lcl_gid_hash);
         e->lie_rmt_uid = rmt_uid;
         e->lie_lcl_uid = lcl_uid;
         e->lie_rmt_gid = rmt_gid;
@@ -203,15 +207,11 @@ struct lustre_idmap_entry *idmap_entry_alloc(uid_t rmt_uid, uid_t lcl_uid,
 
 static void idmap_entry_free(struct lustre_idmap_entry *e)
 {
-        if (!list_empty(&e->lie_rmt_uid_hash))
-                list_del(&e->lie_rmt_uid_hash);
-        if (!list_empty(&e->lie_lcl_uid_hash))
-                list_del(&e->lie_lcl_uid_hash);
-        if (!list_empty(&e->lie_rmt_gid_hash))
-                list_del(&e->lie_rmt_gid_hash);
-        if (!list_empty(&e->lie_lcl_gid_hash))
-                list_del(&e->lie_lcl_gid_hash);
-        OBD_FREE_PTR(e);
+       list_del(&e->lie_rmt_uid_hash);
+       list_del(&e->lie_lcl_uid_hash);
+       list_del(&e->lie_rmt_gid_hash);
+       list_del(&e->lie_lcl_gid_hash);
+       OBD_FREE_PTR(e);
 }
 
 /*
@@ -225,11 +225,11 @@ struct lustre_idmap_entry *idmap_search_entry(struct lustre_idmap_table *t,
                                               uid_t rmt_uid, uid_t lcl_uid,
                                               gid_t rmt_gid, gid_t lcl_gid)
 {
-        struct list_head *head;
+       struct list_head *head;
         struct lustre_idmap_entry *e;
 
         head = &t->lit_idmaps[RMT_UIDMAP_IDX][lustre_idmap_hashfunc(rmt_uid)];
-        list_for_each_entry(e, head, lie_rmt_uid_hash)
+       list_for_each_entry(e, head, lie_rmt_uid_hash)
                 if (e->lie_rmt_uid == rmt_uid) {
                         if (e->lie_lcl_uid == lcl_uid) {
                                 if (e->lie_rmt_gid == rmt_gid &&
@@ -246,7 +246,7 @@ struct lustre_idmap_entry *idmap_search_entry(struct lustre_idmap_table *t,
                 }
 
         head = &t->lit_idmaps[RMT_GIDMAP_IDX][lustre_idmap_hashfunc(rmt_gid)];
-        list_for_each_entry(e, head, lie_rmt_gid_hash)
+       list_for_each_entry(e, head, lie_rmt_gid_hash)
                 if (e->lie_rmt_gid == rmt_gid) {
                         if (e->lie_lcl_gid == lcl_gid) {
                                 if (unlikely(e->lie_rmt_uid == rmt_uid &&
@@ -266,35 +266,36 @@ struct lustre_idmap_entry *idmap_search_entry(struct lustre_idmap_table *t,
         return NULL;
 }
 
-static __u32 idmap_lookup_uid(struct list_head *hash, int reverse, __u32 uid)
+static __u32 idmap_lookup_uid(struct list_head *hash, int reverse,
+                              __u32 uid)
 {
-        struct list_head *head = &hash[lustre_idmap_hashfunc(uid)];
-        struct lustre_idmap_entry *e;
-
-        if (!reverse) {
-                list_for_each_entry(e, head, lie_rmt_uid_hash)
-                        if (e->lie_rmt_uid == uid)
-                                return e->lie_lcl_uid;
-        } else {
-                list_for_each_entry(e, head, lie_lcl_uid_hash)
-                        if (e->lie_lcl_uid == uid)
-                                return e->lie_rmt_uid;
-        }
-
-        return CFS_IDMAP_NOTFOUND;
+       struct list_head *head = &hash[lustre_idmap_hashfunc(uid)];
+       struct lustre_idmap_entry *e;
+
+       if (!reverse) {
+               list_for_each_entry(e, head, lie_rmt_uid_hash)
+                       if (e->lie_rmt_uid == uid)
+                               return e->lie_lcl_uid;
+       } else {
+               list_for_each_entry(e, head, lie_lcl_uid_hash)
+                       if (e->lie_lcl_uid == uid)
+                               return e->lie_rmt_uid;
+       }
+
+       return CFS_IDMAP_NOTFOUND;
 }
 
 static __u32 idmap_lookup_gid(struct list_head *hash, int reverse, __u32 gid)
 {
-        struct list_head *head = &hash[lustre_idmap_hashfunc(gid)];
+       struct list_head *head = &hash[lustre_idmap_hashfunc(gid)];
         struct lustre_idmap_entry *e;
 
         if (!reverse) {
-                list_for_each_entry(e, head, lie_rmt_gid_hash)
+               list_for_each_entry(e, head, lie_rmt_gid_hash)
                         if (e->lie_rmt_gid == gid)
                                 return e->lie_lcl_gid;
         } else {
-                list_for_each_entry(e, head, lie_lcl_gid_hash)
+               list_for_each_entry(e, head, lie_lcl_gid_hash)
                         if (e->lie_lcl_gid == gid)
                                 return e->lie_rmt_gid;
         }
@@ -303,48 +304,48 @@ static __u32 idmap_lookup_gid(struct list_head *hash, int reverse, __u32 gid)
 }
 
 int lustre_idmap_add(struct lustre_idmap_table *t,
-                     uid_t ruid, uid_t luid,
-                     gid_t rgid, gid_t lgid)
+                    uid_t ruid, uid_t luid,
+                    gid_t rgid, gid_t lgid)
 {
-        struct lustre_idmap_entry *e0, *e1;
-
-        LASSERT(t);
-
-        spin_lock(&t->lit_lock);
-        e0 = idmap_search_entry(t, ruid, luid, rgid, lgid);
-        spin_unlock(&t->lit_lock);
-        if (!e0) {
-                e0 = idmap_entry_alloc(ruid, luid, rgid, lgid);
-                if (!e0)
-                        return -ENOMEM;
-
-                spin_lock(&t->lit_lock);
-                e1 = idmap_search_entry(t, ruid, luid, rgid, lgid);
-                if (e1 == NULL) {
-                        list_add_tail(&e0->lie_rmt_uid_hash,
-                                      &t->lit_idmaps[RMT_UIDMAP_IDX]
-                                        [lustre_idmap_hashfunc(ruid)]);
-                        list_add_tail(&e0->lie_lcl_uid_hash,
-                                      &t->lit_idmaps[LCL_UIDMAP_IDX]
-                                        [lustre_idmap_hashfunc(luid)]);
-                        list_add_tail(&e0->lie_rmt_gid_hash,
-                                      &t->lit_idmaps[RMT_GIDMAP_IDX]
-                                        [lustre_idmap_hashfunc(rgid)]);
-                        list_add_tail(&e0->lie_lcl_gid_hash,
-                                      &t->lit_idmaps[LCL_GIDMAP_IDX]
-                                        [lustre_idmap_hashfunc(lgid)]);
-                } 
-                spin_unlock(&t->lit_lock);
-                if (e1 != NULL) {
-                        idmap_entry_free(e0);
-                        if (IS_ERR(e1))
-                                return PTR_ERR(e1);
-                }
-        } else if (IS_ERR(e0)) {
-                return PTR_ERR(e0);
-        }
-
-        return 0;
+       struct lustre_idmap_entry *e0, *e1;
+
+       LASSERT(t);
+
+       spin_lock(&t->lit_lock);
+       e0 = idmap_search_entry(t, ruid, luid, rgid, lgid);
+       spin_unlock(&t->lit_lock);
+       if (!e0) {
+               e0 = idmap_entry_alloc(ruid, luid, rgid, lgid);
+               if (!e0)
+                       return -ENOMEM;
+
+               spin_lock(&t->lit_lock);
+               e1 = idmap_search_entry(t, ruid, luid, rgid, lgid);
+               if (e1 == NULL) {
+                       list_add_tail(&e0->lie_rmt_uid_hash,
+                                     &t->lit_idmaps[RMT_UIDMAP_IDX]
+                                     [lustre_idmap_hashfunc(ruid)]);
+                       list_add_tail(&e0->lie_lcl_uid_hash,
+                                     &t->lit_idmaps[LCL_UIDMAP_IDX]
+                                     [lustre_idmap_hashfunc(luid)]);
+                       list_add_tail(&e0->lie_rmt_gid_hash,
+                                     &t->lit_idmaps[RMT_GIDMAP_IDX]
+                                     [lustre_idmap_hashfunc(rgid)]);
+                       list_add_tail(&e0->lie_lcl_gid_hash,
+                                     &t->lit_idmaps[LCL_GIDMAP_IDX]
+                                     [lustre_idmap_hashfunc(lgid)]);
+               }
+               spin_unlock(&t->lit_lock);
+               if (e1 != NULL) {
+                       idmap_entry_free(e0);
+                       if (IS_ERR(e1))
+                               return PTR_ERR(e1);
+               }
+       } else if (IS_ERR(e0)) {
+               return PTR_ERR(e0);
+       }
+
+       return 0;
 }
 EXPORT_SYMBOL(lustre_idmap_add);
 
@@ -352,85 +353,85 @@ int lustre_idmap_del(struct lustre_idmap_table *t,
                     uid_t ruid, uid_t luid,
                     gid_t rgid, gid_t lgid)
 {
-        struct lustre_idmap_entry *e;
-        int rc = 0;
+       struct lustre_idmap_entry *e;
+       int rc = 0;
 
-        LASSERT(t);
+       LASSERT(t);
 
-        spin_lock(&t->lit_lock);
-        e = idmap_search_entry(t, ruid, luid, rgid, lgid);
-        if (IS_ERR(e))
-                rc = PTR_ERR(e);
-        else if (e)
-                idmap_entry_free(e);
-        spin_unlock(&t->lit_lock);
+       spin_lock(&t->lit_lock);
+       e = idmap_search_entry(t, ruid, luid, rgid, lgid);
+       if (IS_ERR(e))
+               rc = PTR_ERR(e);
+       else if (e)
+               idmap_entry_free(e);
+       spin_unlock(&t->lit_lock);
 
-        return rc;
+       return rc;
 }
 EXPORT_SYMBOL(lustre_idmap_del);
 
-int lustre_idmap_lookup_uid(struct md_ucred *mu,
-                            struct lustre_idmap_table *t,
-                            int reverse, uid_t uid)
+int lustre_idmap_lookup_uid(struct lu_ucred *mu,
+                           struct lustre_idmap_table *t,
+                           int reverse, uid_t uid)
 {
-        struct list_head *hash;
-
-        if (mu && (mu->mu_valid == UCRED_OLD || mu->mu_valid == UCRED_NEW)) {
-                if (!reverse) {
-                        if (uid == mu->mu_o_uid)
-                                return mu->mu_uid;
-                        else if (uid == mu->mu_o_fsuid)
-                                return mu->mu_fsuid;
-                } else {
-                        if (uid == mu->mu_uid)
-                                return mu->mu_o_uid;
-                        else if (uid == mu->mu_fsuid)
-                                return mu->mu_o_fsuid;
-                }
-        }
+       struct list_head *hash;
+
+       if (mu && (mu->uc_valid == UCRED_OLD || mu->uc_valid == UCRED_NEW)) {
+               if (!reverse) {
+                       if (uid == mu->uc_o_uid)
+                               return mu->uc_uid;
+                       else if (uid == mu->uc_o_fsuid)
+                               return mu->uc_fsuid;
+               } else {
+                       if (uid == mu->uc_uid)
+                               return mu->uc_o_uid;
+                       else if (uid == mu->uc_fsuid)
+                               return mu->uc_o_fsuid;
+               }
+       }
 
         if (t == NULL)
                 return CFS_IDMAP_NOTFOUND;
 
         hash = t->lit_idmaps[reverse ? LCL_UIDMAP_IDX : RMT_UIDMAP_IDX];
 
-        spin_lock(&t->lit_lock);
-        uid = idmap_lookup_uid(hash, reverse, uid);
-        spin_unlock(&t->lit_lock);
+       spin_lock(&t->lit_lock);
+       uid = idmap_lookup_uid(hash, reverse, uid);
+       spin_unlock(&t->lit_lock);
 
-        return uid;
+       return uid;
 }
 EXPORT_SYMBOL(lustre_idmap_lookup_uid);
 
-int lustre_idmap_lookup_gid(struct md_ucred *mu, struct lustre_idmap_table *t,
-                            int reverse, gid_t gid)
+int lustre_idmap_lookup_gid(struct lu_ucred *mu, struct lustre_idmap_table *t,
+                           int reverse, gid_t gid)
 {
-        struct list_head *hash;
-
-        if (mu && (mu->mu_valid == UCRED_OLD || mu->mu_valid == UCRED_NEW)) {
-                if (!reverse) {
-                        if (gid == mu->mu_o_gid)
-                                return mu->mu_gid;
-                        else if (gid == mu->mu_o_fsgid)
-                                return mu->mu_fsgid;
-                } else {
-                        if (gid == mu->mu_gid)
-                                return mu->mu_o_gid;
-                        else if (gid == mu->mu_fsgid)
-                                return mu->mu_o_fsgid;
-                }
-        }
+       struct list_head *hash;
+
+       if (mu && (mu->uc_valid == UCRED_OLD || mu->uc_valid == UCRED_NEW)) {
+               if (!reverse) {
+                       if (gid == mu->uc_o_gid)
+                               return mu->uc_gid;
+                       else if (gid == mu->uc_o_fsgid)
+                               return mu->uc_fsgid;
+               } else {
+                       if (gid == mu->uc_gid)
+                               return mu->uc_o_gid;
+                       else if (gid == mu->uc_fsgid)
+                               return mu->uc_o_fsgid;
+               }
+       }
 
         if (t == NULL)
                 return CFS_IDMAP_NOTFOUND;
 
         hash = t->lit_idmaps[reverse ? LCL_GIDMAP_IDX : RMT_GIDMAP_IDX];
 
-        spin_lock(&t->lit_lock);
-        gid = idmap_lookup_gid(hash, reverse, gid);
-        spin_unlock(&t->lit_lock);
+       spin_lock(&t->lit_lock);
+       gid = idmap_lookup_gid(hash, reverse, gid);
+       spin_unlock(&t->lit_lock);
 
-        return gid;
+       return gid;
 }
 EXPORT_SYMBOL(lustre_idmap_lookup_gid);
 
@@ -443,32 +444,33 @@ struct lustre_idmap_table *lustre_idmap_init(void)
         if(unlikely(t == NULL))
                 return (ERR_PTR(-ENOMEM));
 
-        spin_lock_init(&t->lit_lock);
-        for (i = 0; i < ARRAY_SIZE(t->lit_idmaps); i++)
-                for (j = 0; j < ARRAY_SIZE(t->lit_idmaps[i]); j++)
-                        INIT_LIST_HEAD(&t->lit_idmaps[i][j]);
+       spin_lock_init(&t->lit_lock);
+       for (i = 0; i < ARRAY_SIZE(t->lit_idmaps); i++)
+               for (j = 0; j < ARRAY_SIZE(t->lit_idmaps[i]); j++)
+                       INIT_LIST_HEAD(&t->lit_idmaps[i][j]);
 
-        return t;
+       return t;
 }
 EXPORT_SYMBOL(lustre_idmap_init);
 
 void lustre_idmap_fini(struct lustre_idmap_table *t)
 {
-        struct list_head *list;
+       struct list_head *list;
         struct lustre_idmap_entry *e;
         int i;
         LASSERT(t);
 
         list = t->lit_idmaps[RMT_UIDMAP_IDX];
-        spin_lock(&t->lit_lock);
-        for (i = 0; i < CFS_IDMAP_HASHSIZE; i++)
-                while (!list_empty(&list[i])) {
-                        e = list_entry(list[i].next, struct lustre_idmap_entry,
-                                       lie_rmt_uid_hash);
-                        idmap_entry_free(e);
-                }
-        spin_unlock(&t->lit_lock);
-
-        OBD_FREE_PTR(t);
+       spin_lock(&t->lit_lock);
+       for (i = 0; i < CFS_IDMAP_HASHSIZE; i++)
+               while (!list_empty(&list[i])) {
+                       e = list_entry(list[i].next,
+                                      struct lustre_idmap_entry,
+                                      lie_rmt_uid_hash);
+                       idmap_entry_free(e);
+               }
+       spin_unlock(&t->lit_lock);
+
+       OBD_FREE_PTR(t);
 }
 EXPORT_SYMBOL(lustre_idmap_fini);