X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fobdclass%2Fidmap.c;h=f2d77ba65fcac7a8b674219ac54815a2168cd2b1;hb=a4f049b96562fd502b1948fb082767351e040a1c;hp=021d0d60e9e67b023decf7d3c241e24db239ff20;hpb=8c3c81fb787ab0a0152ebf497d1b4aef480bb82f;p=fs%2Flustre-release.git

diff --git a/lustre/obdclass/idmap.c b/lustre/obdclass/idmap.c
index 021d0d6..f2d77ba 100644
--- 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) 2012, 2016, Intel Corporation.
+ * Copyright (c) 2012, 2017, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -39,9 +39,8 @@
 #define DEBUG_SUBSYSTEM S_SEC
 
 #include <linux/user_namespace.h>
-#ifdef HAVE_UIDGID_HEADER
-# include <linux/uidgid.h>
-#endif
+#include <linux/uidgid.h>
+
 #include <lustre_idmap.h>
 #include <upcall_cache.h>
 #include <md_object.h>
@@ -101,12 +100,12 @@ EXPORT_SYMBOL(lustre_groups_from_list);
 /* a simple shell-metzner sort */
 void lustre_groups_sort(struct group_info *group_info)
 {
-        int base, max, stride;
-        int gidsetsize = group_info->ngroups;
+	int base, max, stride;
+	int gidsetsize = group_info->ngroups;
 
-        for (stride = 1; stride < gidsetsize; stride = 3 * stride + 1)
-                ; /* nothing */
-        stride /= 3;
+	for (stride = 1; stride < gidsetsize; stride = 3 * stride + 1)
+		; /* nothing */
+	stride /= 3;
 
 	while (stride) {
 		max = gidsetsize - stride;