mirror of
https://github.com/torvalds/linux.git
synced 2024-11-10 22:21:40 +00:00
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>
This commit is contained in:
parent
e9a4593cc5
commit
2a4e64b8f6
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user