staging: lustre: remove typedef for group_info_t

Use "struct group_info" like the rest of the kernel, not a typedef.

Cc: Peng Tao <tao.peng@emc.com>
Cc: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/lustre/include/linux/libcfs/linux/linux-prim.h b/drivers/staging/lustre/include/linux/libcfs/linux/linux-prim.h
index 23bccf234af9147ddb8249c6a101e29b536fd581..e210a90655b97d2bba26520753e08a4245110857 100644 (file)
--- a/drivers/staging/lustre/include/linux/libcfs/linux/linux-prim.h
+++ b/drivers/staging/lustre/include/linux/libcfs/linux/linux-prim.h
@@ -168,32 +168,7 @@ do {                                                                \
 /*
  * atomic
  */
-
-
 #define cfs_atomic_add_unless(atom, a, u)    atomic_add_unless(atom, a, u)
 #define cfs_atomic_cmpxchg(atom, old, nv)    atomic_cmpxchg(atom, old, nv)
 
-/*
- * membar
- */
-
-
-/*
- * interrupt
- */
-
-
-/*
- * might_sleep
- */
-
-/*
- * group_info
- */
-typedef struct group_info group_info_t;
-
-
-/*
- * Random bytes
- */
 #endif

diff --git a/drivers/staging/lustre/include/linux/libcfs/lucache.h b/drivers/staging/lustre/include/linux/libcfs/lucache.h
index 7ae36fc88d771b7a183e3c35c245203412559bb4..9668b397f0f6090cc5e365e4e71d2dd1d7231926 100644 (file)
--- a/drivers/staging/lustre/include/linux/libcfs/lucache.h
+++ b/drivers/staging/lustre/include/linux/libcfs/lucache.h
@@ -77,7 +77,7 @@ struct md_identity {
        struct upcall_cache_entry *mi_uc_entry;
        uid_t                 mi_uid;
        gid_t                 mi_gid;
-       group_info_t      *mi_ginfo;
+       struct group_info       *mi_ginfo;
        int                     mi_nperms;
        struct md_perm      *mi_perms;
 };

diff --git a/drivers/staging/lustre/lustre/include/lustre_idmap.h b/drivers/staging/lustre/lustre/include/lustre_idmap.h
index 084bdd6ab4dba4ae5cb81fbbf216de00ec4e9430..2da859691d6a4fe49259e0356f8ddca59b284325 100644 (file)
--- a/drivers/staging/lustre/lustre/include/lustre_idmap.h
+++ b/drivers/staging/lustre/lustre/include/lustre_idmap.h
@@ -80,8 +80,8 @@ struct lustre_idmap_table {
 
 struct lu_ucred;
 
-extern void lustre_groups_from_list(group_info_t *ginfo, gid_t *glist);
-extern void lustre_groups_sort(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,

diff --git a/drivers/staging/lustre/lustre/include/md_object.h b/drivers/staging/lustre/lustre/include/md_object.h
index 65b270a6d59097f5e486992030287d716102779f..daf93afe3febde5be284297532421e53f8595c6a 100644 (file)
--- a/drivers/staging/lustre/lustre/include/md_object.h
+++ b/drivers/staging/lustre/lustre/include/md_object.h
@@ -871,7 +871,7 @@ struct lu_ucred {
        __u32          uc_suppgids[2];
        cfs_cap_t          uc_cap;
        __u32          uc_umask;
-       group_info_t   *uc_ginfo;
+       struct group_info *uc_ginfo;
        struct md_identity *uc_identity;
 };
 

diff --git a/drivers/staging/lustre/lustre/obdclass/idmap.c b/drivers/staging/lustre/lustre/obdclass/idmap.c
index afb66a49f828504a96a9ccc8bfb464641c095040..ec2590f5cfe9cc9d0097f5199803a7bab0c8f61f 100644 (file)
--- a/drivers/staging/lustre/lustre/obdclass/idmap.c
+++ b/drivers/staging/lustre/lustre/obdclass/idmap.c
@@ -59,8 +59,7 @@
  * groups_search() is copied from linux kernel!
  * A simple bsearch.
  */
-static int lustre_groups_search(group_info_t *group_info,
-                               gid_t grp)
+static int lustre_groups_search(const struct group_info *group_info, gid_t grp)
 {
        int left, right;
 
@@ -84,7 +83,7 @@ static int lustre_groups_search(group_info_t *group_info,
        return 0;
 }
 
-void lustre_groups_from_list(group_info_t *ginfo, gid_t *glist)
+void lustre_groups_from_list(struct group_info *ginfo, gid_t *glist)
 {
        int i;
        int count = ginfo->ngroups;
@@ -103,7 +102,7 @@ EXPORT_SYMBOL(lustre_groups_from_list);
 
 /* groups_sort() is copied from linux kernel! */
 /* a simple shell-metzner sort */
-void lustre_groups_sort(group_info_t *group_info)
+void lustre_groups_sort(struct group_info *group_info)
 {
        int base, max, stride;
        int gidsetsize = group_info->ngroups;
@@ -141,7 +140,7 @@ int lustre_in_group_p(struct lu_ucred *mu, gid_t grp)
        int rc = 1;
 
        if (grp != mu->uc_fsgid) {
-               group_info_t *group_info = NULL;
+               struct group_info *group_info = NULL;
 
                if (mu->uc_ginfo || !mu->uc_identity ||
                    mu->uc_valid == UCRED_OLD)

diff --git a/drivers/staging/lustre/lustre/ptlrpc/service.c b/drivers/staging/lustre/lustre/ptlrpc/service.c
index d5628e0fedf7aea89830f287469771d6a99f6397..4f0118cc754672dedcb7fd7d40332e48b4cb0466 100644 (file)
--- a/drivers/staging/lustre/lustre/ptlrpc/service.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/service.c
@@ -2266,7 +2266,7 @@ static int ptlrpc_main(void *arg)
        struct ptlrpc_service           *svc = svcpt->scp_service;
        struct ptlrpc_reply_state       *rs;
 #ifdef WITH_GROUP_INFO
-       group_info_t *ginfo = NULL;
+       struct group_info *ginfo = NULL;
 #endif
        struct lu_env *env;
        int counter = 0, rc = 0;