From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934338Ab1KCSdA (ORCPT ); Thu, 3 Nov 2011 14:33:00 -0400 Received: from hapkido.dreamhost.com ([66.33.216.122]:43513 "EHLO hapkido.dreamhost.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933865Ab1KCSc7 (ORCPT ); Thu, 3 Nov 2011 14:32:59 -0400 Subject: [PATCH] ipc/mqueue: simplify reading msgqueue limit From: Davidlohr Bueso Reply-To: dave@gnu.org To: Andrew Morton , Jiri Slaby , Wanlong Gao , Nick Piggin Cc: lkml Content-Type: text/plain; charset="UTF-8" Organization: GNU Date: Thu, 03 Nov 2011 15:31:49 -0300 Message-ID: <1320345109.3188.3.camel@offbook> Mime-Version: 1.0 X-Mailer: Evolution 2.32.2 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Davidlohr Bueso 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 --- ipc/mqueue.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/ipc/mqueue.c b/ipc/mqueue.c index 2e0ecfc..c0e4fbb 100644 --- a/ipc/mqueue.c +++ b/ipc/mqueue.c @@ -127,7 +127,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; @@ -158,7 +157,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; -- 1.7.4.1