v3: utimensat implementation
Subsystems (2)
PATCH 1/1 v3: utimensat implementation
One comment I got suggested to clean up the overflow tests. There is no reason to not perform the full micro-second overflow test in those two places. The four conditions are reduced by the compiler to just two tests so there's no problems with performance.
arch/x86_64/ia32/ia32entry.S +2 -1
@@ -714,9 +714,10 @@ ia32_sys_call_table: .quad compat_sys_get_robust_list .quad sys_splice .quad sys_sync_file_range - .quad sys_tee + .quad sys_tee /* 315 */ .quad compat_sys_vmsplice .quad compat_sys_move_pages .quad sys_getcpu .quad sys_epoll_pwait + .quad compat_sys_utimensat /* 320 */ ia32_syscall_end:
fs/compat.c +33 -6
@@ -79,28 +79,55 @@ int compat_printk(const char *fmt, ...)*/ asmlinkage long compat_sys_utime (char __user *filename,struct compat_utimbuf __user *t) { -struct timeval tv[2 ]; +struct timespec tv[2 ];if (t) {if (get_user (tv[0 ].tv_sec, &t->actime) ||get_user (tv[1 ].tv_sec, &t->modtime))return -EFAULT ; - tv[0 ].tv_usec =0 ; - tv[1 ].tv_usec =0 ; + tv[0 ].tv_nsec =0 ; + tv[1 ].tv_nsec =0 ; }return do_utimes (AT_FDCWD , filename, t ? tv :NULL ); } +asmlinkage long compat_sys_utimensat (unsigned int dfd,char __user *filename,struct compat_timespec __user *t) +{ +struct timespec tv[2 ]; + +if (t) { +if (get_compat_timespec (&tv[0 ], &t[0 ]) || +get_compat_timespec (&tv[1 ], &t[1 ])) +return -EFAULT ; + +if ((tv[0 ].tv_nsec ==UTIME_OMIT || tv[0 ].tv_nsec ==UTIME_NOW ) + && tv[0 ].tv_sec !=0 ) +return -EINVAL ; +if ((tv[1 ].tv_nsec ==UTIME_OMIT || tv[1 ].tv_nsec ==UTIME_NOW ) + && tv[1 ].tv_sec !=0 ) +return -EINVAL ; + +if (tv[0 ].tv_nsec ==UTIME_OMIT && tv[1 ].tv_nsec ==UTIME_OMIT ) +return 0 ; + } +return do_utimes (dfd, filename, t ? tv :NULL ); +} +asmlinkage long compat_sys_futimesat (unsigned int dfd,char __user *filename,struct compat_timeval __user *t) { -struct timeval tv[2 ]; +struct timespec tv[2 ];if (t) {if (get_user (tv[0 ].tv_sec, &t[0 ].tv_sec) || -get_user (tv[0 ].tv_usec, &t[0 ].tv_usec) || +get_user (tv[0 ].tv_nsec, &t[0 ].tv_usec) ||get_user (tv[1 ].tv_sec, &t[1 ].tv_sec) || -get_user (tv[1 ].tv_usec, &t[1 ].tv_usec)) +get_user (tv[1 ].tv_nsec, &t[1 ].tv_usec))return -EFAULT ; +if (tv[0 ].tv_nsec >=1000000 || tv[0 ].tv_nsec <0 || + tv[1 ].tv_nsec >=1000000 || tv[1 ].tv_nsec <0 ) +return -EINVAL ; + tv[0 ].tv_nsec *=1000 ; + tv[1 ].tv_nsec *=1000 ; }return do_utimes (dfd, filename, t ? tv :NULL ); }
fs/utimes.c +62 -9
99 lines not on this page · raw message
include/asm-i386/unistd.h +1 -0
@@ -325,6 +325,7 @@#define __NR_move_pages 317#define __NR_getcpu 318#define __NR_epoll_pwait 319 +#define __NR_utimensat 320#ifdef __KERNEL__
include/asm-x86_64/unistd.h +3 -1
@@ -619,8 +619,10 @@ __SYSCALL(__NR_sync_file_range, sys_sync_file_range) __SYSCALL(__NR_vmsplice, sys_vmsplice)#define __NR_move_pages 279 __SYSCALL(__NR_move_pages, sys_move_pages) +#define __NR_utimensat 280 +__SYSCALL(__NR_utimensat, sys_utimensat) -#define __NR_syscall_max __NR_move_pages +#define __NR_syscall_max __NR_utimensat#ifndef __NO_STUBS#define __ARCH_WANT_OLD_READDIR
include/linux/stat.h +3 -0
@@ -53,6 +53,9 @@#define S_IWUGO (S_IWUSR|S_IWGRP|S_IWOTH)#define S_IXUGO (S_IXUSR|S_IXGRP|S_IXOTH) +#define UTIME_NOW ((1l << 30) - 1l) +#define UTIME_OMIT ((1l << 30) - 2l) +#include <linux/types.h> #include <linux/time.h>
include/linux/time.h +1 -1
@@ -109,7 +109,7 @@ extern void do_gettimeofday(struct timeval *tv);extern int do_settimeofday (struct timespec *tv);extern int do_sys_settimeofday (struct timespec *tv,struct timezone *tz);#define do_posix_clock_monotonic_gettime (ts) ktime_get_ts(ts) -extern long do_utimes (int dfd,char __user *filename,struct timeval *times); +extern long do_utimes (int dfd,char __user *filename,struct timespec *times);struct itimerval ;extern int do_setitimer (int which,struct itimerval *value,struct itimerval *ovalue);
urgh.
patching file arch/x86_64/ia32/ia32entry.S
Hunk #1 FAILED at 714.
1 out of 1 hunk FAILED -- saving rejects to file arch/x86_64/ia32/ia32entry.S.rej patching file fs/compat.c
Hunk #1 FAILED at 79.
1 out of 1 hunk FAILED -- saving rejects to file fs/compat.c.rej patching file fs/utimes.c
Hunk #2 FAILED at 77.
Hunk #3 FAILED at 101.
Hunk #4 FAILED at 134.
3 out of 4 hunks FAILED -- saving rejects to file fs/utimes.c.rej patching file include/asm-i386/unistd.h
Hunk #1 FAILED at 325.
1 out of 1 hunk FAILED -- saving rejects to file include/asm-i386/unistd.h.rej patching file include/asm-x86_64/unistd.h
Hunk #1 FAILED at 619.
1 out of 1 hunk FAILED -- saving rejects to file include/asm-x86_64/unistd.h.rej patching file include/linux/stat.h
patching file include/linux/time.h
Hunk #1 FAILED at 109.
1 out of 1 hunk FAILED -- saving rejects to file include/linux/time.h.rej
there's a little bit of intersection with lutimesat() there.
Can we revisit this in a couple of weeks please?
Quoted 1 line · Andrew Morton
there's a little bit of intersection with
lutimesat()there.
I totally forgot about this. Please do not merge the current lutimesat patch. We have to change it to lutimensat() the same way this new utimensat() improves over futimesat().
Do yo have the broken out patch somewhere? I'll make the change and merge it with the utimensat patch.
Signature · 1 line
➧ Ulrich Drepper ➧ Red Hat, Inc. ➧ 444 Castro St ➧ Mountain View, CA ❖
Quoted 6 lines · On Fri, 27 Apr 2007 07:25:00 -0700 Ulrich Drepper <[email protected]> wrote:
Quoted 1 line · Andrew Morton
there's a little bit of intersection with
lutimesat()there.I totally forgot about this. Please do not merge the current lutimesat patch. We have to change it to
lutimensat()the same way this newutimensat()improves overfutimesat().
OK.
Quoted 2 lines
Do yo have the broken out patch somewhere? I'll make the change and merge it with the utimensat patch.
ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.21-rc7/2.6.21-rc7-mm2/broken-out/
contains
lutimesat-simplify-utime2.patch lutimesat-extend-do_utimes-with-flags.patch lutimesat-actual-syscall-and-wire-up-on-i386.patch lutimesat-compat-syscall-and-wire-up-on-x86_64.patch
in that patching order.
I'll drop those four and will grab utimensat v3.