lkml.org 
[lkml]   [2021]   [Jun]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] fs/epoll: Simplify error case
Date
There is only one failure case, so there is no need
to use goto statements and define error.

Signed-off-by: Yejune Deng <yejunedeng@gmail.com>
---
fs/eventpoll.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/fs/eventpoll.c b/fs/eventpoll.c
index 1e596e1..b53f263 100644
--- a/fs/eventpoll.c
+++ b/fs/eventpoll.c
@@ -928,15 +928,15 @@ 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;
+ if (unlikely(!ep)) {
+ free_uid(user);
+ return -ENOMEM;
+ }

mutex_init(&ep->mtx);
rwlock_init(&ep->lock);
@@ -950,10 +950,6 @@ static int ep_alloc(struct eventpoll **pep)
*pep = ep;

return 0;
-
-free_uid:
- free_uid(user);
- return error;
}

/*
--
2.7.4
\
 
 \ /
  Last update: 2021-06-02 10:48    [W:0.023 / U:1.292 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site