X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Flustre_idmap.h;h=a7d38413fcb86ff883cc3c94c63a15227fe3e013;hb=449186a71320e3406f6f06cc8cc89be71c016e9f;hp=b2a1dc01338b3190fe3dc97cea85f153411916f5;hpb=e3a7c58aebafce40323db54bf6056029e5af4a70;p=fs%2Flustre-release.git

diff --git a/lustre/include/lustre_idmap.h b/lustre/include/lustre_idmap.h
index b2a1dc0..a7d3841 100644
--- a/lustre/include/lustre_idmap.h
+++ b/lustre/include/lustre_idmap.h
@@ -26,6 +26,8 @@
 /*
  * 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/
@@ -45,9 +47,9 @@
  * @{
  */
 
-#include <md_object.h>
+#include <libcfs/libcfs.h>
 
-#define CFS_NGROUPS_PER_BLOCK   ((int)(CFS_PAGE_SIZE / sizeof(gid_t)))
+#define CFS_NGROUPS_PER_BLOCK   ((int)(PAGE_CACHE_SIZE / sizeof(gid_t)))
 
 #define CFS_GROUP_AT(gi, i) \
         ((gi)->blocks[(i) / CFS_NGROUPS_PER_BLOCK][(i) % CFS_NGROUPS_PER_BLOCK])
@@ -72,13 +74,15 @@ enum lustre_idmap_idx {
 };
 
 struct lustre_idmap_table {
-        cfs_spinlock_t   lit_lock;
-        cfs_list_t       lit_idmaps[CFS_IDMAP_N_HASHES][CFS_IDMAP_HASHSIZE];
+	spinlock_t	 lit_lock;
+	struct list_head lit_idmaps[CFS_IDMAP_N_HASHES][CFS_IDMAP_HASHSIZE];
 };
 
-extern void lustre_groups_from_list(cfs_group_info_t *ginfo, gid_t *glist);
-extern void lustre_groups_sort(cfs_group_info_t *group_info);
-extern int lustre_in_group_p(struct md_ucred *mu, gid_t grp);
+struct lu_ucred;
+
+extern void lustre_groups_from_list(struct group_info *ginfo, gid_t *glist);
+extern void lustre_groups_sort(struct group_info *group_info);
+extern int lustre_in_group_p(struct lu_ucred *mu, gid_t grp);
 
 extern int lustre_idmap_add(struct lustre_idmap_table *t,
                             uid_t ruid, uid_t luid,
@@ -86,12 +90,12 @@ extern int lustre_idmap_add(struct lustre_idmap_table *t,
 extern int lustre_idmap_del(struct lustre_idmap_table *t,
                             uid_t ruid, uid_t luid,
                             gid_t rgid, gid_t lgid);
-extern int lustre_idmap_lookup_uid(struct md_ucred *mu,
-                                   struct lustre_idmap_table *t,
-                                   int reverse, uid_t uid);
-extern int lustre_idmap_lookup_gid(struct md_ucred *mu,
-                                   struct lustre_idmap_table *t,
-                                   int reverse, gid_t gid);
+extern int lustre_idmap_lookup_uid(struct lu_ucred *mu,
+				   struct lustre_idmap_table *t,
+				   int reverse, uid_t uid);
+extern int lustre_idmap_lookup_gid(struct lu_ucred *mu,
+				   struct lustre_idmap_table *t,
+				   int reverse, gid_t gid);
 extern struct lustre_idmap_table *lustre_idmap_init(void);
 extern void lustre_idmap_fini(struct lustre_idmap_table *t);