[PATCH] Futex-fd error return fix

Hugh Dickins caught this confusion between the ret variable in outer
scope (holding the fd) and the return value of f_setown.  Rename inner
"ret".

diff --git a/kernel/futex.c b/kernel/futex.c
index 695e20eb222f789620adec0de832b6d252ceba26..6691f6475869f89dd38955ad56563a48db6d2cd7 100644 (file)
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -478,12 +478,12 @@ static int futex_fd(unsigned long uaddr, int signal)
        filp->f_dentry = dget(futex_mnt->mnt_root);
 
        if (signal) {
-               int ret;
-               
-               ret = f_setown(filp, current->tgid, 1);
-               if (ret) {
+               int err;
+               err = f_setown(filp, current->tgid, 1);
+               if (err < 0) {
                        put_unused_fd(ret);
                        put_filp(filp);
+                       ret = err;
                        goto out;
                }
                filp->f_owner.signum = signal;