From patchwork Wed Apr 25 16:03:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 26975 Received: (qmail 63430 invoked by alias); 25 Apr 2018 16:05:22 -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 63204 invoked by uid 89); 25 Apr 2018 16:05:20 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.8 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_LAZY_DOMAIN_SECURITY, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.2 spammy= X-HELO: mout.kundenserver.de From: Arnd Bergmann To: y2038@lists.linaro.org, linux-kernel@vger.kernel.org Cc: Arnd Bergmann , linux-api@vger.kernel.org, linux-arch@vger.kernel.org, libc-alpha@sourceware.org, tglx@linutronix.de, netdev@vger.kernel.org, deepa.kernel@gmail.com, viro@zeniv.linux.org.uk, albert.aribaud@3adev.fr, Peter Zijlstra , Darren Hart , "Eric W. Biederman" , Dominik Brodowski Subject: [PATCH 12/17] y2038: aio: Prepare sys_io_getevents for __kernel_timespec Date: Wed, 25 Apr 2018 18:03:06 +0200 Message-Id: <20180425160311.2718314-13-arnd@arndb.de> In-Reply-To: <20180425160311.2718314-1-arnd@arndb.de> References: <20180425160311.2718314-1-arnd@arndb.de> X-UI-Out-Filterresults: notjunk:1; V01:K0:yEzicpM9y5s=:GpoynPZ0JPhbV/v2tedIep RiZj6qO2l+Et5w68oHl5mFXevFj9/TjsCD7dmdq/rKHrb1HtR5/0DjIVh+OaJfZZ2Bxg2r0r5 1zoiObLi9Ihs9Hdt6crf8uu3J3Sdvbdi3CJgfFAXkMZ3ANZf2ZkmpSL3J17cMyCJs5hhzPO42 dW0ZlYzgZ6ScUPYBh028Y0DOwyy/heMkeOOmZBciQowcgWWRP/QDUTJszPPIzeZrllsTcu+um AqBtduKuUtO4OhkdjeaYBuQPe1vMXrcdbOVDiTwiIWH0bJV/ISGG3eRhJY4F1XTe1Rz0+eA95 UngF8AQvtdMihJwto5lwH8Acbykl8/KzM3hns5QYwTmDkfTTjyCVuHVm58oDN8BF10/nImNxq yh7BNLZQWJtoj6kUlb+2agKcHp9DbP1H+CBiTv4aoQ5Y185wziuuOiblh70MG03wespO5DCeQ M1eb+1NIZHSYimOiK9imrz7M6cWX7QKX0mkXqoL4NpwmRqCgSBsFPFsB9pO7BOLV11zpvgfEq r6D4CdH4kEZ3+T0Vk2mApvJonmrxHCme3Ld4ghN4lbOrjOopHPavbIasna5/JirWwXp0ZLmFN TGNvAHT/tXUTZep4yLrwG2L533CWDluYCTkERN6BUYMPZWHjh4a2fPWjyEE4YeOIlHIZMgJEc /eC9Mjs5KEwc6BUL63kr3ARnpxXHPBqcxUmyBIcqvZCsTwPA4C+0yZg033UK9oUOWK7s= This is a preparation patch for converting sys_io_getevents to work with 64-bit time_t on 32-bit architectures. The 'timeout' argument is changed to struct __kernel_timespec, which will be redefined using 64-bit time_t in the future. The compat version of the system call in turn is enabled for compilation with CONFIG_COMPAT_32BIT_TIME so the individual 32-bit architectures can share the handling of the traditional argument with 64-bit architectures providing it for their compat mode. Signed-off-by: Arnd Bergmann --- fs/aio.c | 4 ++-- include/linux/syscalls.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/aio.c b/fs/aio.c index 88d7927ffbc6..64fea8c27b16 100644 --- a/fs/aio.c +++ b/fs/aio.c @@ -1858,7 +1858,7 @@ SYSCALL_DEFINE5(io_getevents, aio_context_t, ctx_id, long, min_nr, long, nr, struct io_event __user *, events, - struct timespec __user *, timeout) + struct __kernel_timespec __user *, timeout) { struct timespec64 ts; @@ -1870,7 +1870,7 @@ SYSCALL_DEFINE5(io_getevents, aio_context_t, ctx_id, return do_io_getevents(ctx_id, min_nr, nr, events, timeout ? &ts : NULL); } -#ifdef CONFIG_COMPAT +#ifdef CONFIG_COMPAT_32BIT_TIME COMPAT_SYSCALL_DEFINE5(io_getevents, compat_aio_context_t, ctx_id, compat_long_t, min_nr, compat_long_t, nr, diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h index 2619678359ee..ffd8674e9df7 100644 --- a/include/linux/syscalls.h +++ b/include/linux/syscalls.h @@ -289,7 +289,7 @@ asmlinkage long sys_io_getevents(aio_context_t ctx_id, long min_nr, long nr, struct io_event __user *events, - struct timespec __user *timeout); + struct __kernel_timespec __user *timeout); /* fs/xattr.c */ asmlinkage long sys_setxattr(const char __user *path, const char __user *name,