LU-6401 header: remove assert from interval_set()

[fs/lustre-release.git] / lustre / include / lustre_idmap.h

diff --git a/lustre/include/lustre_idmap.h b/lustre/include/lustre_idmap.h
index 411f6a2..078ba9f 100644 (file)
--- 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,56 +47,20 @@
  * @{
  */
 
-#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_SIZE / sizeof(gid_t)))
 
 #define CFS_GROUP_AT(gi, i) \
         ((gi)->blocks[(i) / CFS_NGROUPS_PER_BLOCK][(i) % CFS_NGROUPS_PER_BLOCK])
 
-enum {
-        CFS_IC_NOTHING     = 0,    /* convert nothing */
-        CFS_IC_ALL         = 1,    /* convert all items */
-        CFS_IC_MAPPED      = 2,    /* convert mapped uid/gid */
-        CFS_IC_UNMAPPED    = 3     /* convert unmapped uid/gid */
-};
-
-#define  CFS_IDMAP_NOTFOUND     (-1)
-
-#define CFS_IDMAP_HASHSIZE      32
 
-enum lustre_idmap_idx {
-        RMT_UIDMAP_IDX,
-        LCL_UIDMAP_IDX,
-        RMT_GIDMAP_IDX,
-        LCL_GIDMAP_IDX,
-        CFS_IDMAP_N_HASHES
-};
+struct lu_ucred;
 
-struct lustre_idmap_table {
-       spinlock_t      lit_lock;
-       cfs_list_t      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 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,
-                            gid_t rgid, gid_t lgid);
-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 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);
-
 /** @} idmap */
 
 #endif