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

Commit 2a4e64b8 authored by Davidlohr Bueso's avatar Davidlohr Bueso Committed by Linus Torvalds
Browse files

ipc/mqueue: simplify reading msgqueue limit 



Because the current task is being used to get the limit, we can simply
use rlimit() instead of task_rlimit().

Signed-off-by: default avatarDavidlohr Bueso <dave@gnu.org>
Acked-by: default avatarKOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e9a4593c

ipc/mqueue.c

+1 −2
Original line number Diff line number Diff line
@@ -128,7 +128,6 @@ static struct inode *mqueue_get_inode(struct super_block *sb, 


	if (S_ISREG(mode)) {

		struct mqueue_inode_info *info;

		struct task_struct *p = current;

		unsigned long mq_bytes, mq_msg_tblsz;



		inode->i_fop = &mqueue_file_operations;
@@ -159,7 +158,7 @@ static struct inode *mqueue_get_inode(struct super_block *sb, 


		spin_lock(&mq_lock);

		if (u->mq_bytes + mq_bytes < u->mq_bytes ||

		    u->mq_bytes + mq_bytes > task_rlimit(p, RLIMIT_MSGQUEUE)) {

		    u->mq_bytes + mq_bytes > rlimit(RLIMIT_MSGQUEUE)) {

			spin_unlock(&mq_lock);

			/* mqueue_evict_inode() releases info->messages */

			ret = -EMFILE;