From patchwork Mon Oct 28 16:59:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukasz Majewski X-Patchwork-Id: 1185572 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-106394-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="Fa7++yge"; 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 4721DC4F3Sz9s7T for ; Tue, 29 Oct 2019 03:59:55 +1100 (AEDT) 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:mime-version:content-transfer-encoding; q=dns; s= default; b=N+wXpEOicHYoUJrGSnxCl/PK7gt2u8Za50VN143yox8WSQBA79FYP 6hALMuERGrNCLFpf10LvHfkCn20wnNBOGsekabZDaRQ3xYiBQhN+wM1DwvxxOlpO RyjYZfhxl7FDrOiNXwKc0t7fSc21aXmzfygwnJ5QlOf1PedZtvjWSE= 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:mime-version:content-transfer-encoding; s=default; bh=VrzZjicWxTU0gTCQYpvG/0/Gixg=; b=Fa7++ygewkKn2tU8GC/EafVPDqE3 YwtptBiZg5LWSaBXJXtYJ3yKGre7byMEEImLoO/kYwDh06id6U4sCb3bd1bYTvOi lkckmiYTfr+jgal7lnKv9rYXStA2XUEFhMizx7jELneeTzK/9i/5vRwUpe23xlnL +VFcd5VrdUAh5XA= Received: (qmail 53316 invoked by alias); 28 Oct 2019 16:59:49 -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 53306 invoked by uid 89); 28 Oct 2019 16:59:49 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-19.9 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 spammy=Moreover X-HELO: mail-out.m-online.net From: Lukasz Majewski To: Joseph Myers , Paul Eggert Cc: Alistair Francis , Alistair Francis , GNU C Library , Adhemerval Zanella , Florian Weimer , Florian Weimer , Zack Weinberg , Lukasz Majewski Subject: [PATCH 2/2] y2038: linux: Provide __futimens64 implementation Date: Mon, 28 Oct 2019 17:59:26 +0100 Message-Id: <20191028165926.10351-2-lukma@denx.de> In-Reply-To: <20191028165926.10351-1-lukma@denx.de> References: <20191028165926.10351-1-lukma@denx.de> MIME-Version: 1.0 This patch provides new __futimens64 explicit 64 bit function for setting access and modification time of file (by using its file descriptor). Moreover, a 32 bit version - __futimens has been refactored to internally use __futimens64. The __futimens is now supposed to be used on systems still supporting 32 bit time (__TIMESIZE != 64) - hence the necessary conversions to 64 bit struct __timespec64. When pointer to struct __timespec64 is NULL - the file access and modification time is set to the current one (by the kernel) and no conversions from struct timespec to __timespec64 are performed. The __futimens64 reuses __utimensat64_helper defined for __utimensat64. The test procedure for __futimens64 is the same as for __utimensat64 conversion patch. --- include/time.h | 7 +++++++ sysdeps/unix/sysv/linux/futimens.c | 22 +++++++++++++++++++--- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/include/time.h b/include/time.h index 432489ae29..0ec6528d78 100644 --- a/include/time.h +++ b/include/time.h @@ -153,6 +153,13 @@ extern int __utimensat64_helper (int fd, const char *file, const struct __timespec64 tsp[2], int flags); libc_hidden_proto (__utimensat64_helper); +#if __TIMESIZE == 64 +# define __futimens64 __futimens +#else +extern int __futimens64 (int fd, const struct __timespec64 tsp[2]); +libc_hidden_proto (__futimens64); +#endif + /* Compute the `struct tm' representation of T, offset OFFSET seconds east of UTC, and store year, yday, mon, mday, wday, hour, min, sec into *TP. diff --git a/sysdeps/unix/sysv/linux/futimens.c b/sysdeps/unix/sysv/linux/futimens.c index 1f233d1246..15fc43b69c 100644 --- a/sysdeps/unix/sysv/linux/futimens.c +++ b/sysdeps/unix/sysv/linux/futimens.c @@ -29,10 +29,26 @@ Starting with 2.6.22 the Linux kernel has the utimensat syscall which can be used to implement futimens. */ int -futimens (int fd, const struct timespec tsp[2]) +__futimens64 (int fd, const struct __timespec64 tsp64[2]) { 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); + + return __utimensat64_helper (fd, NULL, &tsp64[0], 0); +} + +#if __TIMESIZE != 64 +int +__futimens (int fd, const struct timespec tsp[2]) +{ + struct __timespec64 tsp64[2]; + if (tsp) + { + tsp64[0] = valid_timespec_to_timespec64 (tsp[0]); + tsp64[1] = valid_timespec_to_timespec64 (tsp[1]); + } + + return __futimens64 (fd, tsp ? &tsp64[0] : NULL); } +#endif +weak_alias (__futimens, futimens)