lkml.org 
[lkml]   [2014]   [Oct]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 2/5] fs/anon_inodes.c: Simplify control flow in anon_inode_getfd()
Date
Signed-off-by: Eric Biggers <ebiggers3@gmail.com>
---
fs/anon_inodes.c | 18 ++++++------------
1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/fs/anon_inodes.c b/fs/anon_inodes.c
index 1faff09..268153a 100644
--- a/fs/anon_inodes.c
+++ b/fs/anon_inodes.c
@@ -136,26 +136,20 @@ EXPORT_SYMBOL_GPL(anon_inode_getfile);
int anon_inode_getfd(const char *name, const struct file_operations *fops,
void *priv, int flags)
{
- int error, fd;
+ int fd;
struct file *file;

- error = get_unused_fd_flags(flags);
- if (error < 0)
- return error;
- fd = error;
+ fd = get_unused_fd_flags(flags);
+ if (fd < 0)
+ return fd;

file = anon_inode_getfile(name, fops, priv, flags);
if (IS_ERR(file)) {
- error = PTR_ERR(file);
- goto err_put_unused_fd;
+ put_unused_fd(fd);
+ return PTR_ERR(file);
}
fd_install(fd, file);
-
return fd;
-
-err_put_unused_fd:
- put_unused_fd(fd);
- return error;
}
EXPORT_SYMBOL_GPL(anon_inode_getfd);

--
2.1.2


\
 
 \ /
  Last update: 2014-10-12 23:21    [W:0.257 / U:0.048 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site