Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-9153 llog: consolidate common error checking
[fs/lustre-release.git]
/
lustre
/
obdclass
/
idmap.c
diff --git
a/lustre/obdclass/idmap.c
b/lustre/obdclass/idmap.c
index
72edb60
..
b45c6d6
100644
(file)
--- a/
lustre/obdclass/idmap.c
+++ b/
lustre/obdclass/idmap.c
@@
-23,7
+23,7
@@
* Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
* Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2012, 201
4
, Intel Corporation.
+ * Copyright (c) 2012, 201
6
, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
*/
/*
* This file is part of Lustre, http://www.lustre.org/
@@
-87,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)
{
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;
int i;
int count = ginfo->ngroups;
@@
-99,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;
}
memcpy(ginfo->blocks[i], glist + off, len);
count -= cp_count;
}
+#endif
}
EXPORT_SYMBOL(lustre_groups_from_list);
}
EXPORT_SYMBOL(lustre_groups_from_list);