Commit 0f943850 authored by Jangwoong Kim's avatar Jangwoong Kim Committed by Thomas Gleixner
Browse files

futex: Remove unneeded gotos 



Get rid of gotos that do not contain any cleanup. These were not removed in
commit 9180bd46 ("futex: Remove put_futex_key()").

Signed-off-by: default avatarJangwoong Kim <6812skiii@gmail.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/20201230122953.10473-1-6812skiii@gmail.com
parent 1ce53e2c

kernel/futex.c

+3 −4
Original line number Diff line number Diff line
@@ -3024,7 +3024,7 @@ static int futex_unlock_pi(u32 __user *uaddr, unsigned int flags) 
		 * Success, we're done! No tricky corner cases.

		 */

		if (!ret)

			goto out_putkey;

			return ret;

		/*

		 * The atomic access to the futex value generated a

		 * pagefault, so retry the user-access and the wakeup:
@@ -3041,7 +3041,7 @@ static int futex_unlock_pi(u32 __user *uaddr, unsigned int flags) 
		 * wake_futex_pi has detected invalid state. Tell user

		 * space.

		 */

		goto out_putkey;

		return ret;

	}



	/*
@@ -3062,7 +3062,7 @@ static int futex_unlock_pi(u32 __user *uaddr, unsigned int flags) 


		default:

			WARN_ON_ONCE(1);

			goto out_putkey;

			return ret;

		}

	}
@@ -3073,7 +3073,6 @@ static int futex_unlock_pi(u32 __user *uaddr, unsigned int flags) 


out_unlock:

	spin_unlock(&hb->lock);

out_putkey:

	return ret;



pi_retry: