X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Flustre_idmap.h;h=a7d38413fcb86ff883cc3c94c63a15227fe3e013;hb=617a53daff1768d88f694ae349214d5c6606d3cf;hp=411f6a259d1d656eb67ca9b13966551228993603;hpb=60a9fd37185edf57fc42bf6a5ad9b9c61fc10e14;p=fs%2Flustre-release.git

diff --git a/lustre/include/lustre_idmap.h b/lustre/include/lustre_idmap.h
index 411f6a2..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,12 +74,14 @@ enum lustre_idmap_idx {
 };
 
 struct lustre_idmap_table {
-	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);
+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,