Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8834cf79 authored by André Goddard Rosa's avatar André Goddard Rosa Committed by Al Viro
Browse files

mqueue: apply mathematics distributivity on mq_bytes calculation 



Code size reduction:
   text    data     bss     dec     hex filename
   9941      72      16   10029    272d ipc/mqueue-BEFORE.o
   9925      72      16   10013    271d ipc/mqueue-AFTER.o

Signed-off-by: default avatarAndré Goddard Rosa <andre.goddard@gmail.com>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent c8308b1c

ipc/mqueue.c

+5 −4
Original line number Diff line number Diff line
@@ -261,8 +261,9 @@ static void mqueue_delete_inode(struct inode *inode) 


	clear_inode(inode);



	mq_bytes = (info->attr.mq_maxmsg * sizeof(struct msg_msg *) +

		   (info->attr.mq_maxmsg * info->attr.mq_msgsize));

	/* Total amount of bytes accounted for the mqueue */

	mq_bytes = info->attr.mq_maxmsg * (sizeof(struct msg_msg *)

	    + info->attr.mq_msgsize);

	user = info->user;

	if (user) {

		spin_lock(&mq_lock);
@@ -601,8 +602,8 @@ static int mq_attr_ok(struct ipc_namespace *ipc_ns, struct mq_attr *attr) 
	/* check for overflow */

	if (attr->mq_msgsize > ULONG_MAX/attr->mq_maxmsg)

		return 0;

	if ((unsigned long)(attr->mq_maxmsg * attr->mq_msgsize) +

	    (attr->mq_maxmsg * sizeof (struct msg_msg *)) <

	if ((unsigned long)(attr->mq_maxmsg * (attr->mq_msgsize

	    + sizeof (struct msg_msg *))) <

	    (unsigned long)(attr->mq_maxmsg * attr->mq_msgsize))

		return 0;

	return 1;