From 2acb7827ec5e60a3b1c530f665cd8b28deb2ca54 Mon Sep 17 00:00:00 2001
From: Davidlohr Bueso <dave@gnu.org>
Date: Fri, 20 Jan 2012 14:34:01 -0800
Subject: [PATCH] --- yaml --- r: 286597 b: refs/heads/master c:
 2a4e64b8f6bcbf23ddd375b78342051ae8862284 h: refs/heads/master i:   286595:
 828b5b359ac53783e1f521bc99d311a68dc87b93 v: v3

---
 [refs]             | 2 +-
 trunk/ipc/mqueue.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index e50ad81eeefa..ad768bc76e86 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e9a4593cc5e36c6d47c87b439cb41c2568e7395f
+refs/heads/master: 2a4e64b8f6bcbf23ddd375b78342051ae8862284
diff --git a/trunk/ipc/mqueue.c b/trunk/ipc/mqueue.c
index 9b7c8ab7d75c..86ee272de210 100644
--- a/trunk/ipc/mqueue.c
+++ b/trunk/ipc/mqueue.c
@@ -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;