|
@@ -144,8 +144,9 @@ static struct inode *mqueue_get_inode(struct super_block *sb,
|
|
info->qsize = 0;
|
|
info->qsize = 0;
|
|
info->user = NULL; /* set when all is ok */
|
|
info->user = NULL; /* set when all is ok */
|
|
memset(&info->attr, 0, sizeof(info->attr));
|
|
memset(&info->attr, 0, sizeof(info->attr));
|
|
- info->attr.mq_maxmsg = ipc_ns->mq_msg_max;
|
|
|
|
- info->attr.mq_msgsize = ipc_ns->mq_msgsize_max;
|
|
|
|
|
|
+ info->attr.mq_maxmsg = min(ipc_ns->mq_msg_max, DFLT_MSG);
|
|
|
|
+ info->attr.mq_msgsize =
|
|
|
|
+ min(ipc_ns->mq_msgsize_max, DFLT_MSGSIZE);
|
|
if (attr) {
|
|
if (attr) {
|
|
info->attr.mq_maxmsg = attr->mq_maxmsg;
|
|
info->attr.mq_maxmsg = attr->mq_maxmsg;
|
|
info->attr.mq_msgsize = attr->mq_msgsize;
|
|
info->attr.mq_msgsize = attr->mq_msgsize;
|