LU-9019 ptlrpc: migrate pinger to 64 bit time

[fs/lustre-release.git] / lustre / obdclass / idmap.c

diff --git a/lustre/obdclass/idmap.c b/lustre/obdclass/idmap.c
index 6652f89..b45c6d6 100644 (file)
--- a/lustre/obdclass/idmap.c
+++ b/lustre/obdclass/idmap.c
@@ -15,11 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
@@ -27,7 +23,7 @@
  * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2012, 2014, Intel Corporation.
+ * Copyright (c) 2012, 2016, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -91,6 +87,9 @@ static int lustre_groups_search(struct group_info *group_info,
 
 void lustre_groups_from_list(struct group_info *ginfo, gid_t *glist)
 {
+#ifdef HAVE_GROUP_INFO_GID
+       memcpy(ginfo->gid, glist, ginfo->ngroups * sizeof(__u32));
+#else
        int i;
        int count = ginfo->ngroups;
 
@@ -103,6 +102,7 @@ void lustre_groups_from_list(struct group_info *ginfo, gid_t *glist)
                memcpy(ginfo->blocks[i], glist + off, len);
                count -= cp_count;
        }
+#endif
 }
 EXPORT_SYMBOL(lustre_groups_from_list);