From e72fdc57095b1f37ec0c7129279c668210d9c8fd Mon Sep 17 00:00:00 2001
From: Rusty Russell <rusty@rustcorp.com.au>
Date: Sat, 6 Sep 2003 00:22:21 -0700
Subject: [PATCH] [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".
---
 kernel/futex.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/kernel/futex.c b/kernel/futex.c
index 695e20eb222f..6691f6475869 100644
--- 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;
-- 
2.39.5