Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-29 06:12:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

[PATCH] sys_open() cleanup

Browse Source 
Clean up tortured logic in sys_open().

Signed-off-by: Telemaque Ndizihiwe <telendiz@eircom.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Telemaque Ndizihiwe 2005-06-23 00:10:33 -07:00 committed by Linus Torvalds
parent 64ccd715d3
commit fed2fc18a4
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
fs/open.c
View File

@ -934,7 +934,7 @@ EXPORT_SYMBOL(fd_install);
asmlinkage long sys_open(const char __user * filename, int flags, int mode) asmlinkage long sys_open(const char __user * filename, int flags, int mode)
{ {
char * tmp; char * tmp;
int fd, error; int fd;
if (force_o_largefile()) if (force_o_largefile())
flags |= O_LARGEFILE; flags |= O_LARGEFILE;
@ -945,20 +945,16 @@ asmlinkage long sys_open(const char __user * filename, int flags, int mode)
fd = get_unused_fd(); fd = get_unused_fd();
if (fd >= 0) { if (fd >= 0) {
struct file *f = filp_open(tmp, flags, mode); struct file *f = filp_open(tmp, flags, mode);
error = PTR_ERR(f); if (IS_ERR(f)) {
if (IS_ERR(f)) put_unused_fd(fd);
goto out_error; fd = PTR_ERR(f);
fd_install(fd, f); } else {
fd_install(fd, f);
}
} }
out:
putname(tmp); putname(tmp);
} }
return fd; return fd;
out_error:
put_unused_fd(fd);
fd = error;
goto out;
} }
EXPORT_SYMBOL_GPL(sys_open); EXPORT_SYMBOL_GPL(sys_open);