From patchwork Mon Jun 23 15:16:01 2014
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Andreas Schwab <schwab@suse.de>
X-Patchwork-Id: 1665
Received: (qmail 8830 invoked by alias); 23 Jun 2014 15:16:07 -0000
Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <libc-alpha.sourceware.org>
List-Unsubscribe: <mailto:libc-alpha-unsubscribe-##L=##H@sourceware.org>
List-Subscribe: <mailto:libc-alpha-subscribe@sourceware.org>
List-Archive: <http://sourceware.org/ml/libc-alpha/>
List-Post: <mailto:libc-alpha@sourceware.org>
List-Help: <mailto:libc-alpha-help@sourceware.org>,
	<http://sourceware.org/ml/#faqs>
Sender: libc-alpha-owner@sourceware.org
Delivered-To: mailing list libc-alpha@sourceware.org
Received: (qmail 8818 invoked by uid 89); 23 Jun 2014 15:16:06 -0000
Authentication-Results: sourceware.org; auth=none
X-Virus-Found: No
X-Spam-SWARE-Status: No, score=-2.9 required=5.0 tests=AWL, BAYES_00,
	T_RP_MATCHES_RCVD autolearn=ham version=3.3.2
X-HELO: mx2.suse.de
From: Andreas Schwab <schwab@suse.de>
To: "Joseph S. Myers" <joseph@codesourcery.com>
Cc: <libc-alpha@sourceware.org>
Subject: Re: Remove __ASSUME_SOCK_CLOEXEC / SOCK_CLOEXEC conditionals in
	Linux-specific code
References: <Pine.LNX.4.64.1406202102130.1155@digraph.polyomino.org.uk>
X-Yow: YOW!!  Everybody out of the GENETIC POOL!
Date: Mon, 23 Jun 2014 17:16:01 +0200
In-Reply-To: <Pine.LNX.4.64.1406202102130.1155@digraph.polyomino.org.uk>
	(Joseph S. Myers's message of "Fri, 20 Jun 2014 21:03:22 +0000")
Message-ID: <mvmbntjy7v2.fsf@hawking.suse.de>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux)
MIME-Version: 1.0

"Joseph S. Myers" <joseph@codesourcery.com> writes:

> -
> -      /* Make sure the descriptor is closed on exec.  */
> -      if (have_sock_cloexec < 0
> -	  && fcntl (netlink_socket, F_SETFD, FD_CLOEXEC) != 0)
> -	goto errout;

That's the last use.  Committed.

Andreas.

	* nptl/sysdeps/unix/sysv/linux/mq_notify.c (init_mq_netlink):
	Remove unused errout label.

diff --git a/nptl/sysdeps/unix/sysv/linux/mq_notify.c b/nptl/sysdeps/unix/sysv/linux/mq_notify.c
index 6893d8c..d50a9f2 100644
--- a/nptl/sysdeps/unix/sysv/linux/mq_notify.c
+++ b/nptl/sysdeps/unix/sysv/linux/mq_notify.c
@@ -209,7 +209,6 @@ init_mq_netlink (void)
 
   if (err != 0)
     {
-    errout:
       close_not_cancel_no_status (netlink_socket);
       netlink_socket = -1;
     }