Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-07 13:43:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[PATCH] futex: remove duplicate code

Browse Source 
This patch cleans up the error path of futex_fd() by removing duplicate
code.

Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Pekka Enberg 2005-09-06 15:17:44 -07:00 committed by Linus Torvalds
parent 580b2e3c01
commit 39ed3fdeec
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
kernel/futex.c
View File

@ -786,23 +786,17 @@ static int futex_fd(unsigned long uaddr, int signal)
filp->f_mapping = filp->f_dentry->d_inode->i_mapping; filp->f_mapping = filp->f_dentry->d_inode->i_mapping;
if (signal) { if (signal) {
int err;
err = f_setown(filp, current->pid, 1); err = f_setown(filp, current->pid, 1);
if (err < 0) { if (err < 0) {
put_unused_fd(ret); goto error;
put_filp(filp);
ret = err;
goto out;
} }
filp->f_owner.signum = signal; filp->f_owner.signum = signal;
} }
q = kmalloc(sizeof(*q), GFP_KERNEL); q = kmalloc(sizeof(*q), GFP_KERNEL);
if (!q) { if (!q) {
put_unused_fd(ret); err = -ENOMEM;
put_filp(filp); goto error;
ret = -ENOMEM;
goto out;
} }
down_read(&current->mm->mmap_sem); down_read(&current->mm->mmap_sem);
@ -810,10 +804,8 @@ static int futex_fd(unsigned long uaddr, int signal)
if (unlikely(err != 0)) { if (unlikely(err != 0)) {
up_read(&current->mm->mmap_sem); up_read(&current->mm->mmap_sem);
put_unused_fd(ret);
put_filp(filp);
kfree(q); kfree(q);
return err; goto error;
} }
/* /*
@ -829,6 +821,11 @@ static int futex_fd(unsigned long uaddr, int signal)
fd_install(ret, filp); fd_install(ret, filp);
out: out:
return ret; return ret;
error:
put_unused_fd(ret);
put_filp(filp);
ret = err;
goto out;
} }
long do_futex(unsigned long uaddr, int op, int val, unsigned long timeout, long do_futex(unsigned long uaddr, int op, int val, unsigned long timeout,