summaryrefslogtreecommitdiff
path: root/ipc
diff options
context:
space:
mode:
authorDavidlohr Bueso <dave@gnu.org>2012-01-20 22:34:01 (GMT)
committerLinus Torvalds <torvalds@linux-foundation.org>2012-01-23 16:38:47 (GMT)
commit2a4e64b8f6bcbf23ddd375b78342051ae8862284 (patch)
tree90e753679ca8ff867dc42e84e5a33c90f813c244 /ipc
parente9a4593cc5e36c6d47c87b439cb41c2568e7395f (diff)
downloadlinux-3.10-2a4e64b8f6bcbf23ddd375b78342051ae8862284.zip
linux-3.10-2a4e64b8f6bcbf23ddd375b78342051ae8862284.tar.gz
linux-3.10-2a4e64b8f6bcbf23ddd375b78342051ae8862284.tar.bz2
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: Davidlohr Bueso <dave@gnu.org> Acked-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'ipc')
-rw-r--r--ipc/mqueue.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/ipc/mqueue.c b/ipc/mqueue.c
index 9b7c8ab..86ee272 100644
--- a/ipc/mqueue.c
+++ b/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;