shm: Move struct shmid_kernel into ipc/shm.c

All of the users are now in ipc/shm.c so make the definition local to
that file to make code maintenance easier.  AKA to prevent rebuilding
the entire kernel when struct shmid_kernel changes.

Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>

diff --git a/include/linux/shm.h b/include/linux/shm.h
index 2bbafac..3a8eae3 100644 (file)
--- a/include/linux/shm.h
+++ b/include/linux/shm.h
@@ -7,28 +7,6 @@
 #include <uapi/linux/shm.h>
 #include <asm/shmparam.h>
 
-struct shmid_kernel /* private to the kernel */
-{      
-       struct kern_ipc_perm    shm_perm;
-       struct file             *shm_file;
-       unsigned long           shm_nattch;
-       unsigned long           shm_segsz;
-       time64_t                shm_atim;
-       time64_t                shm_dtim;
-       time64_t                shm_ctim;
-       pid_t                   shm_cprid;
-       pid_t                   shm_lprid;
-       struct user_struct      *mlock_user;
-
-       /* The task created the shm object.  NULL if the task is dead. */
-       struct task_struct      *shm_creator;
-       struct list_head        shm_clist;      /* list by creator */
-} __randomize_layout;
-
-/* shm_mode upper byte flags */
-#define        SHM_DEST        01000   /* segment will be destroyed on last detach */
-#define SHM_LOCKED      02000   /* segment will not be swapped */
-
 #ifdef CONFIG_SYSVIPC
 struct sysv_shm {
        struct list_head shm_clist;

diff --git a/ipc/shm.c b/ipc/shm.c
index 387a786..0565669 100644 (file)
--- a/ipc/shm.c
+++ b/ipc/shm.c
@@ -48,6 +48,28 @@
 
 #include "util.h"
 
+struct shmid_kernel /* private to the kernel */
+{
+       struct kern_ipc_perm    shm_perm;
+       struct file             *shm_file;
+       unsigned long           shm_nattch;
+       unsigned long           shm_segsz;
+       time64_t                shm_atim;
+       time64_t                shm_dtim;
+       time64_t                shm_ctim;
+       pid_t                   shm_cprid;
+       pid_t                   shm_lprid;
+       struct user_struct      *mlock_user;
+
+       /* The task created the shm object.  NULL if the task is dead. */
+       struct task_struct      *shm_creator;
+       struct list_head        shm_clist;      /* list by creator */
+} __randomize_layout;
+
+/* shm_mode upper byte flags */
+#define SHM_DEST       01000   /* segment will be destroyed on last detach */
+#define SHM_LOCKED     02000   /* segment will not be swapped */
+
 struct shm_file_data {
        int id;
        struct ipc_namespace *ns;