mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 02:30:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

epoll: simplify ep_alloc()

Browse source 
The get_current_user() does not fail, and moving it after kzalloc() can
simplify the code a bit.

Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com>
Message-Id: <20230726032135.933-1-thunder.leizhen@huaweicloud.com>
Signed-off-by: Christian Brauner <brauner@kernel.org>
This commit is contained in:
Zhen Lei 2023-07-26 11:21:35 +08:00 committed by Christian Brauner
parent 0d5a4f8f77
commit 05f26f86f4
1 changed files with 2 additions and 10 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

12
fs/eventpoll.c
View file

@ -975,15 +975,11 @@ void eventpoll_release_file(struct file *file)
static int ep_alloc(struct eventpoll **pep) static int ep_alloc(struct eventpoll **pep)
{ {
int error;
struct user_struct *user;
struct eventpoll *ep; struct eventpoll *ep;
user = get_current_user();
error = -ENOMEM;
ep = kzalloc(sizeof(*ep), GFP_KERNEL); ep = kzalloc(sizeof(*ep), GFP_KERNEL);
if (unlikely(!ep)) if (unlikely(!ep))
goto free_uid; return -ENOMEM;
mutex_init(&ep->mtx); mutex_init(&ep->mtx);
rwlock_init(&ep->lock); rwlock_init(&ep->lock);
@ -992,16 +988,12 @@ static int ep_alloc(struct eventpoll **pep)
INIT_LIST_HEAD(&ep->rdllist); INIT_LIST_HEAD(&ep->rdllist);
ep->rbr = RB_ROOT_CACHED; ep->rbr = RB_ROOT_CACHED;
ep->ovflist = EP_UNACTIVE_PTR; ep->ovflist = EP_UNACTIVE_PTR;
ep->user = user; ep->user = get_current_user();
refcount_set(&ep->refcount, 1); refcount_set(&ep->refcount, 1);
*pep = ep; *pep = ep;
return 0; return 0;
free_uid:
free_uid(user);
return error;
} }
/* /*