From: Simon Wilkinson <sxw@your-file-system.com>
Date: Sat, 11 Sep 2010 11:43:35 +0000 (+0100)
Subject: Linux: Move keyring includes where they're needed
X-Git-Tag: debian/1.6.0.pre3-1~5^2^2~57
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=adf5ea13347aee4227e1253a5fcb68d9a3dcfacd;p=packages%2Fo%2Fopenafs.git

Linux: Move keyring includes where they're needed

We don't need the keyring headers in every file, so reduce
namespace pollution by just including them in osi_groups.c, which is
the only place that uses them.

Reviewed-on: http://gerrit.openafs.org/2746
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
(cherry picked from commit 33ce7a9308c8a71fbfcea82a935e32521031f48d)

Change-Id: Ia943179a23c856ef9d37d1774192389cfe38612a
Reviewed-on: http://gerrit.openafs.org/4067
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
---

diff --git a/src/afs/LINUX/osi_groups.c b/src/afs/LINUX/osi_groups.c
index c3515ad1a..baaff78cc 100644
--- a/src/afs/LINUX/osi_groups.c
+++ b/src/afs/LINUX/osi_groups.c
@@ -28,6 +28,17 @@
 
 #include <linux/smp_lock.h>
 
+#if defined(LINUX_KEYRING_SUPPORT)
+# include <linux/rwsem.h>
+# include <linux/key.h>
+# if defined(HAVE_LINUX_KEY_TYPE_H)
+#  include <linux/key-type.h>
+# endif
+# ifndef KEY_ALLOC_IN_QUOTA
+#  define KEY_ALLOC_IN_QUOTA 1
+# endif
+#endif
+
 #ifdef AFS_LINUX26_ONEGROUP_ENV
 # define NUMPAGGROUPS 1
 
diff --git a/src/afs/sysincludes.h b/src/afs/sysincludes.h
index 56a1daa5c..f7abc2e46 100644
--- a/src/afs/sysincludes.h
+++ b/src/afs/sysincludes.h
@@ -135,16 +135,6 @@
 #   include <linux/security.h>
 #  endif
 #  include <linux/suspend.h>
-#  if defined(LINUX_KEYRING_SUPPORT)
-#   include <linux/rwsem.h>
-#   include <linux/key.h>
-#   if defined(HAVE_LINUX_KEY_TYPE_H)
-#    include <linux/key-type.h>
-#   endif
-#   ifndef KEY_ALLOC_IN_QUOTA
-#    define KEY_ALLOC_IN_QUOTA 1
-#   endif
-#  endif
 # endif
 /* Avoid conflicts with coda overloading AFS type namespace. Must precede
  * inclusion of uaccess.h.