From patchwork Tue Mar 22 20:30:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aurelien Jarno X-Patchwork-Id: 600942 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 3qV48s0frkz9s5g for ; Wed, 23 Mar 2016 07:31:08 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b=JdDMev1n; dkim-atps=neutral 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:in-reply-to :references; q=dns; s=default; b=Xd+vbFGsiG376EpvKkrYbt7Q21icpWE d6oy1esy/jbc0Bw2NEhJXfwDpyBoU4z7AOfuODCna+ddTRY4BiGEd/yUY9kavLsN bKHJPEm/IHixRNxF7HncnyOavJId2BwUANVkucBcx+w/GcBNvdFx7BaihvVyidWm blSOm0ARd46Q= 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:in-reply-to :references; s=default; bh=RhB1yzSCd6elO5Di4Wq+44hHG+k=; b=JdDMe v1ngdQgQ+gzTY+oCxUzHWN1vfG4t9tdSlzY2HHDD0UAn718hj40FepCkFmJM1HaW oT276FHftm3SkJW/syTFGn3cGooYUhtRHZpVPkEWpBB0/dXSE9mHPsxaxII783dR 08DWHnnAOe10UK45pbaSOGIH+HcvwXUgvkHm/E= Received: (qmail 7596 invoked by alias); 22 Mar 2016 20:31:03 -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 7017 invoked by uid 89); 22 Mar 2016 20:30:55 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-0.9 required=5.0 tests=BAYES_00, KAM_LAZY_DOMAIN_SECURITY, T_RP_MATCHES_RCVD autolearn=no version=3.3.2 spammy=tsp, 414, INLINE_SYSCALL, inline_syscall X-HELO: hall.aurel32.net From: Aurelien Jarno To: libc-alpha@sourceware.org Cc: Aurelien Jarno Subject: [PATCH 2/2] Remove __NR_utimensat Date: Tue, 22 Mar 2016 21:30:40 +0100 Message-Id: <1458678640-29310-2-git-send-email-aurelien@aurel32.net> In-Reply-To: <1458678640-29310-1-git-send-email-aurelien@aurel32.net> References: <1458678640-29310-1-git-send-email-aurelien@aurel32.net> With the 2.6.32 minimum kernel on x86 and 3.2 on other architectures, __NR_utimensat is always defined. Changelog: * sysdeps/unix/sysv/linux/futimens.c (futimens) [__NR_utimensat]: Make code unconditional. [!__NR_utimensat]: Remove conditional code. * sysdeps/unix/sysv/linux/lutimes.c (lutimes) [__NR_utimensat]: Make code unconditional. [!__NR_utimensat]: Remove conditional code. * sysdeps/unix/sysv/linux/utimensat.c (utimensat) [__NR_utimensat]: Make code unconditional. [!__NR_utimensat]: Remove conditional code. --- ChangeLog | 12 ++++++++++++ sysdeps/unix/sysv/linux/futimens.c | 7 ------- sysdeps/unix/sysv/linux/lutimes.c | 8 -------- sysdeps/unix/sysv/linux/utimensat.c | 7 ------- 4 files changed, 12 insertions(+), 22 deletions(-) diff --git a/ChangeLog b/ChangeLog index c403722..6d04d97 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,17 @@ 2016-03-22 Aurelien Jarno + * sysdeps/unix/sysv/linux/futimens.c (futimens) [__NR_utimensat]: + Make code unconditional. + [!__NR_utimensat]: Remove conditional code. + * sysdeps/unix/sysv/linux/lutimes.c (lutimes) [__NR_utimensat]: + Make code unconditional. + [!__NR_utimensat]: Remove conditional code. + * sysdeps/unix/sysv/linux/utimensat.c (utimensat) [__NR_utimensat]: + Make code unconditional. + [!__NR_utimensat]: Remove conditional code. + +2016-03-22 Aurelien Jarno + * sysdeps/unix/sysv/linux/dl-openat64.c (openat64) [__NR_openat]: Make code unconditional. diff --git a/sysdeps/unix/sysv/linux/futimens.c b/sysdeps/unix/sysv/linux/futimens.c index 3176e65..3f96210 100644 --- a/sysdeps/unix/sysv/linux/futimens.c +++ b/sysdeps/unix/sysv/linux/futimens.c @@ -31,15 +31,8 @@ int futimens (int fd, const struct timespec tsp[2]) { -#ifdef __NR_utimensat if (fd < 0) return INLINE_SYSCALL_ERROR_RETURN_VALUE (EBADF); /* Avoid implicit array coercion in syscall macros. */ return INLINE_SYSCALL (utimensat, 4, fd, NULL, &tsp[0], 0); -#else - return INLINE_SYSCALL_ERROR_RETURN_VALUE (ENOSYS); -#endif } -#ifndef __NR_utimensat -stub_warning (futimens) -#endif diff --git a/sysdeps/unix/sysv/linux/lutimes.c b/sysdeps/unix/sysv/linux/lutimes.c index 69d3cfa..49fad3e 100644 --- a/sysdeps/unix/sysv/linux/lutimes.c +++ b/sysdeps/unix/sysv/linux/lutimes.c @@ -27,7 +27,6 @@ int lutimes (const char *file, const struct timeval tvp[2]) { -#ifdef __NR_utimensat /* The system call espects timespec, not timeval. */ struct timespec ts[2]; if (tvp != NULL) @@ -42,11 +41,4 @@ lutimes (const char *file, const struct timeval tvp[2]) return INLINE_SYSCALL (utimensat, 4, AT_FDCWD, file, tvp ? ts : NULL, AT_SYMLINK_NOFOLLOW); -#else - return INLINE_SYSCALL_ERROR_RETURN_VALUE (ENOSYS); -#endif } - -#ifndef __NR_utimensat -stub_warning (lutimes) -#endif diff --git a/sysdeps/unix/sysv/linux/utimensat.c b/sysdeps/unix/sysv/linux/utimensat.c index f3a9697..89af2f5 100644 --- a/sysdeps/unix/sysv/linux/utimensat.c +++ b/sysdeps/unix/sysv/linux/utimensat.c @@ -31,13 +31,6 @@ utimensat (int fd, const char *file, const struct timespec tsp[2], { if (file == NULL) return INLINE_SYSCALL_ERROR_RETURN_VALUE (EINVAL); -#ifdef __NR_utimensat /* Avoid implicit array coercion in syscall macros. */ return INLINE_SYSCALL (utimensat, 4, fd, file, &tsp[0], flags); -#else - return INLINE_SYSCALL_ERROR_RETURN_VALUE (ENOSYS); -#endif } -#ifndef __NR_utimensat -stub_warning (utimensat) -#endif