git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
netns xfrm: fix "ip xfrm state|policy count" misreport
[safe/jmp/linux-2.6]
/
fs
/
utimes.c
diff --git
a/fs/utimes.c
b/fs/utimes.c
index
6929e3e
..
e4c75db
100644
(file)
--- a/
fs/utimes.c
+++ b/
fs/utimes.c
@@
-24,7
+24,7
@@
* must be owner or have write permission.
* Else, update from *times, must be owner or super user.
*/
* must be owner or have write permission.
* Else, update from *times, must be owner or super user.
*/
-
asmlinkage long sys_utime(char __user *filename, struct utimbuf __user *
times)
+
SYSCALL_DEFINE2(utime, char __user *, filename, struct utimbuf __user *,
times)
{
struct timespec tv[2];
{
struct timespec tv[2];
@@
-170,7
+170,8
@@
out:
return error;
}
return error;
}
-asmlinkage long sys_utimensat(int dfd, char __user *filename, struct timespec __user *utimes, int flags)
+SYSCALL_DEFINE4(utimensat, int, dfd, char __user *, filename,
+ struct timespec __user *, utimes, int, flags)
{
struct timespec tstimes[2];
{
struct timespec tstimes[2];
@@
-187,7
+188,8
@@
asmlinkage long sys_utimensat(int dfd, char __user *filename, struct timespec __
return do_utimes(dfd, filename, utimes ? tstimes : NULL, flags);
}
return do_utimes(dfd, filename, utimes ? tstimes : NULL, flags);
}
-asmlinkage long sys_futimesat(int dfd, char __user *filename, struct timeval __user *utimes)
+SYSCALL_DEFINE3(futimesat, int, dfd, char __user *, filename,
+ struct timeval __user *, utimes)
{
struct timeval times[2];
struct timespec tstimes[2];
{
struct timeval times[2];
struct timespec tstimes[2];
@@
-214,7
+216,8
@@
asmlinkage long sys_futimesat(int dfd, char __user *filename, struct timeval __u
return do_utimes(dfd, filename, utimes ? tstimes : NULL, 0);
}
return do_utimes(dfd, filename, utimes ? tstimes : NULL, 0);
}
-asmlinkage long sys_utimes(char __user *filename, struct timeval __user *utimes)
+SYSCALL_DEFINE2(utimes, char __user *, filename,
+ struct timeval __user *, utimes)
{
return sys_futimesat(AT_FDCWD, filename, utimes);
}
{
return sys_futimesat(AT_FDCWD, filename, utimes);
}