From patchwork Mon Apr 2 19:47:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 894368 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-91339-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ens-lyon.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="U0p89jsA"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40FN6B2f0fz9s21 for ; Tue, 3 Apr 2018 05:47:13 +1000 (AEST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id; q=dns; s= default; b=B8+G1F30uROJswbfUaqV/x9EzdjsUIQDjp/Y3pPiN4v7o7puDjktr Jw+k8Dh/KmXAZxg1GBeA6+LQPds3lGfYfQ1TUSk72BCnIzxdudPqH4aKCrg7eqKN MgmDI2v4G+Y9HLI8p2rwjNPYxRgPdt4bxzDYUTETTd75TuiRipBVVs= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id; s=default; bh=31V9XkG43Yj5sCJa8b62EfX48qQ=; b=U0p89jsAhQFKPfe7Y8b+yywVBLn9 Fo3TQvsTLiuxWRd1v5IOa/TxYUMw9X0Muq/iCEa3RouehpaXSDpBbPj7XljariqU QieLFcIxOwhGbccFtwEPB1fnbKZbyqZzeW4v0sFdYA7NB83fTDwqGDB06Uat5fcf ajy+0aKQsmVIi5Y= Received: (qmail 25653 invoked by alias); 2 Apr 2018 19:47:08 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 25643 invoked by uid 89); 2 Apr 2018 19:47:07 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.1 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_HELO_PASS, SPF_NEUTRAL autolearn=ham version=3.3.2 spammy= X-HELO: hera.aquilenet.fr From: Samuel Thibault To: libc-alpha@sourceware.org Cc: Samuel Thibault Subject: [hurd,commited] Revert __dirfd PLT avoidance for now Date: Mon, 2 Apr 2018 21:47:02 +0200 Message-Id: <20180402194702.24270-1-samuel.thibault@ens-lyon.org> * io/fts.c (fts_build): Call dirfd instead of __dirfd. --- ChangeLog | 1 - io/fts.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index e63f9878e9..cbc98364a0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -317,7 +317,6 @@ (_hurd_siginfo_handler): Call _IO_puts instead of puts. * hurd/xattr.c (_hurd_xattr_get, _hurd_xattr_set): Call __munmap instead of munmap. - * io/fts.c (fts_build): Call __dirfd instead of dirfd. * mach/devstream.c: Include . (dealloc_ref): Call __mach_port_deallocate instead of mach_port_deallocate. diff --git a/io/fts.c b/io/fts.c index a30491c230..ad9d333f45 100644 --- a/io/fts.c +++ b/io/fts.c @@ -680,7 +680,7 @@ fts_build (FTSOBJ *sp, int type) */ cderrno = 0; if (nlinks || type == BREAD) { - if (fts_safe_changedir(sp, cur, __dirfd(dirp), NULL)) { + if (fts_safe_changedir(sp, cur, dirfd(dirp), NULL)) { if (nlinks && type == BREAD) cur->fts_errno = errno; cur->fts_flags |= FTS_DONTCHDIR;