nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

shm: Move struct shmid_kernel into ipc/shm.c

Browse source 
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>
This commit is contained in:
Eric W. Biederman 2018-03-22 21:34:44 -05:00
parent 1a5c1349d1
commit a2e102cd3c
2 changed files with 22 additions and 22 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

22
include/linux/shm.h
View file

@ -7,28 +7,6 @@
#include <uapi/linux/shm.h> #include <uapi/linux/shm.h>
#include <asm/shmparam.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 #ifdef CONFIG_SYSVIPC
struct sysv_shm { struct sysv_shm {
struct list_head shm_clist; struct list_head shm_clist;

22
ipc/shm.c
View file

@ -48,6 +48,28 @@
#include "util.h" #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 { struct shm_file_data {
int id; int id;
struct ipc_namespace *ns; struct ipc_namespace *ns;