LU-6512 llite:ll_dir_ioctl cleanup of redundant comparisons

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

diff --git a/lustre/obdclass/idmap.c b/lustre/obdclass/idmap.c
index df6c57b..a7cec60 100644 (file)
--- a/lustre/obdclass/idmap.c
+++ b/lustre/obdclass/idmap.c
@@ -27,7 +27,7 @@
  * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2012, Intel Corporation.
+ * Copyright (c) 2012, 2014, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -42,19 +42,22 @@
 
 #define DEBUG_SUBSYSTEM S_SEC
 
-#include <libcfs/lucache.h>
-
+#include <linux/user_namespace.h>
+#ifdef HAVE_UIDGID_HEADER
+# include <linux/uidgid.h>
+#endif
 #include <lustre_idmap.h>
+#include <upcall_cache.h>
 #include <md_object.h>
 #include <obd_support.h>
 
-#define lustre_get_group_info(group_info) do {             \
-       atomic_inc(&(group_info)->usage);              \
+#define lustre_get_group_info(group_info) do {         \
+       atomic_inc(&(group_info)->usage);               \
 } while (0)
 
-#define lustre_put_group_info(group_info) do {             \
-       if (atomic_dec_and_test(&(group_info)->usage)) \
-               groups_free(group_info);                   \
+#define lustre_put_group_info(group_info) do {         \
+       if (atomic_dec_and_test(&(group_info)->usage))  \
+               groups_free(group_info);                \
 } while (0)
 
 /*