Skip to content

Commit 34b56df

Browse files
committed
msg: Move struct msg_queue into ipc/msg.c
All of the users are now in ipc/msg.c so make the definition local to that file to make code maintenance easier. AKA to prevent rebuilding the entire kernel when struct msg_queue changes. Signed-off-by: "Eric W. Biederman" <[email protected]>
1 parent a2e102c commit 34b56df

File tree

2 files changed

+17
-18
lines changed

2 files changed

+17
-18
lines changed

include/linux/msg.h

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
#define _LINUX_MSG_H
44

55
#include <linux/list.h>
6-
#include <linux/time64.h>
76
#include <uapi/linux/msg.h>
87

98
/* one msg_msg structure for each message */
@@ -16,21 +15,4 @@ struct msg_msg {
1615
/* the actual message follows immediately */
1716
};
1817

19-
/* one msq_queue structure for each present queue on the system */
20-
struct msg_queue {
21-
struct kern_ipc_perm q_perm;
22-
time64_t q_stime; /* last msgsnd time */
23-
time64_t q_rtime; /* last msgrcv time */
24-
time64_t q_ctime; /* last change time */
25-
unsigned long q_cbytes; /* current number of bytes on queue */
26-
unsigned long q_qnum; /* number of messages in queue */
27-
unsigned long q_qbytes; /* max number of bytes on queue */
28-
pid_t q_lspid; /* pid of last msgsnd */
29-
pid_t q_lrpid; /* last receive pid */
30-
31-
struct list_head q_messages;
32-
struct list_head q_receivers;
33-
struct list_head q_senders;
34-
} __randomize_layout;
35-
3618
#endif /* _LINUX_MSG_H */

ipc/msg.c

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,23 @@
4343
#include <linux/uaccess.h>
4444
#include "util.h"
4545

46+
/* one msq_queue structure for each present queue on the system */
47+
struct msg_queue {
48+
struct kern_ipc_perm q_perm;
49+
time64_t q_stime; /* last msgsnd time */
50+
time64_t q_rtime; /* last msgrcv time */
51+
time64_t q_ctime; /* last change time */
52+
unsigned long q_cbytes; /* current number of bytes on queue */
53+
unsigned long q_qnum; /* number of messages in queue */
54+
unsigned long q_qbytes; /* max number of bytes on queue */
55+
pid_t q_lspid; /* pid of last msgsnd */
56+
pid_t q_lrpid; /* last receive pid */
57+
58+
struct list_head q_messages;
59+
struct list_head q_receivers;
60+
struct list_head q_senders;
61+
} __randomize_layout;
62+
4663
/* one msg_receiver structure for each sleeping receiver */
4764
struct msg_receiver {
4865
struct list_head r_list;

0 commit comments

Comments
 (0)