Skip to content

Commit

Permalink
epoll: simplify ep_alloc()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Zhen Lei authored and Christian Brauner committed Jul 26, 2023
1 parent 0d5a4f8 commit 05f26f8
Showing 1 changed file with 2 additions and 10 deletions.
12 changes: 2 additions & 10 deletions fs/eventpoll.c
Original file line number Diff line number Diff line change
Expand Up @@ -975,15 +975,11 @@ void eventpoll_release_file(struct file *file)

static int ep_alloc(struct eventpoll **pep)
{
int error;
struct user_struct *user;
struct eventpoll *ep;

user = get_current_user();
error = -ENOMEM;
ep = kzalloc(sizeof(*ep), GFP_KERNEL);
if (unlikely(!ep))
goto free_uid;
return -ENOMEM;

mutex_init(&ep->mtx);
rwlock_init(&ep->lock);
Expand All @@ -992,16 +988,12 @@ static int ep_alloc(struct eventpoll **pep)
INIT_LIST_HEAD(&ep->rdllist);
ep->rbr = RB_ROOT_CACHED;
ep->ovflist = EP_UNACTIVE_PTR;
ep->user = user;
ep->user = get_current_user();
refcount_set(&ep->refcount, 1);

*pep = ep;

return 0;

free_uid:
free_uid(user);
return error;
}

/*
Expand Down

0 comments on commit 05f26f8

Please sign in to comment.