[PATCH] ipc/mqueue: simplify reading msgqueue limit

[PATCH] ipc/mqueue: simplify reading msgqueue limit

[Davidlohr Bueso]

From: Davidlohr Bueso <dave@gnu.org>

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>
---
 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

Re: [PATCH] ipc/mqueue: simplify reading msgqueue limit

[Davidlohr Bueso]

ping?

On Thu, 2011-11-03 at 15:31 -0300, Davidlohr Bueso wrote:
> From: Davidlohr Bueso <dave@gnu.org>
> 
> 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>
> ---
>  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;

Re: [PATCH] ipc/mqueue: simplify reading msgqueue limit

[KOSAKI Motohiro]

On 11/7/2011 5:15 PM, Davidlohr Bueso wrote:
> ping?
> 
> On Thu, 2011-11-03 at 15:31 -0300, Davidlohr Bueso wrote:
>> From: Davidlohr Bueso <dave@gnu.org>
>>
>> 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>

Sorry for the delay.

	Acked-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>



>> ---
>>  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;
> 
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/
>