Messages in this thread Patch in this message | | | Subject | [PATCH] futex: remove duplicate code | From | Pekka Enberg <> | Date | Tue, 23 Aug 2005 18:07:40 +0300 |
| |
Hi!
This patch cleans up the error path of futex_fd() by removing duplicate code.
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi> ---
futex.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-)
Index: 2.6-mm/kernel/futex.c =================================================================== --- 2.6-mm.orig/kernel/futex.c +++ 2.6-mm/kernel/futex.c @@ -673,23 +673,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); @@ -697,10 +691,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; } /* @@ -716,6 +708,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,
- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |