From: Pekka Enberg This patch cleans up the error path of futex_fd() by removing duplicate code. Signed-off-by: Pekka Enberg Signed-off-by: Andrew Morton --- kernel/futex.c | 21 +++++++++------------ 1 files changed, 9 insertions(+), 12 deletions(-) diff -puN kernel/futex.c~futex-remove-duplicate-code kernel/futex.c --- 25/kernel/futex.c~futex-remove-duplicate-code Mon Aug 29 14:03:57 2005 +++ 25-akpm/kernel/futex.c Mon Aug 29 14:03:57 2005 @@ -786,23 +786,17 @@ static int futex_fd(unsigned long uaddr, filp->f_mapping = filp->f_dentry->d_inode->i_mapping; if (signal) { - int err; err = f_setown(filp, current->pid, 1); if (err < 0) { - put_unused_fd(ret); - put_filp(filp); - ret = err; - goto out; + goto error; } filp->f_owner.signum = signal; } q = kmalloc(sizeof(*q), GFP_KERNEL); if (!q) { - put_unused_fd(ret); - put_filp(filp); - ret = -ENOMEM; - goto out; + err = -ENOMEM; + goto error; } down_read(¤t->mm->mmap_sem); @@ -810,10 +804,8 @@ static int futex_fd(unsigned long uaddr, if (unlikely(err != 0)) { up_read(¤t->mm->mmap_sem); - put_unused_fd(ret); - put_filp(filp); kfree(q); - return err; + goto error; } /* @@ -829,6 +821,11 @@ static int futex_fd(unsigned long uaddr, fd_install(ret, filp); out: 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, _