Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 19487
b: refs/heads/master
c: 9ad11ab
h: refs/heads/master
i:
  19485: cd656ae
  19483: d1c4504
  19479: 16266d6
  19471: 2a6b210
  19455: 817dcf0
v: v3
  • Loading branch information
Stephen Rothwell authored and Linus Torvalds committed Feb 2, 2006
1 parent 0178570 commit 3de817d
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 8aeba3c62a64e0f6527d1a0388b1a6a7060158ba
refs/heads/master: 9ad11ab48b1ad618bf47076e9e579f267f5306c2
12 changes: 6 additions & 6 deletions trunk/fs/compat.c
Original file line number Diff line number Diff line change
Expand Up @@ -73,17 +73,17 @@ asmlinkage long compat_sys_utime(char __user *filename, struct compat_utimbuf __
return do_utimes(AT_FDCWD, filename, t ? tv : NULL);
}

asmlinkage long compat_sys_futimesat(int dfd, char __user *filename, struct compat_timeval __user *t)
asmlinkage long compat_sys_futimesat(unsigned int dfd, char __user *filename, struct compat_timeval __user *t)
{
struct timeval tv[2];

if (t) {
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[1].tv_sec, &t[1].tv_sec) ||
get_user(tv[1].tv_usec, &t[1].tv_usec))
return -EFAULT;
}
return -EFAULT;
}
return do_utimes(dfd, filename, t ? tv : NULL);
}

Expand Down Expand Up @@ -114,7 +114,7 @@ asmlinkage long compat_sys_newlstat(char __user * filename,
return error;
}

asmlinkage long compat_sys_newfstatat(int dfd, char __user *filename,
asmlinkage long compat_sys_newfstatat(unsigned int dfd, char __user *filename,
struct compat_stat __user *statbuf, int flag)
{
struct kstat stat;
Expand Down Expand Up @@ -1326,7 +1326,7 @@ compat_sys_open(const char __user *filename, int flags, int mode)
* O_LARGEFILE flag.
*/
asmlinkage long
compat_sys_openat(int dfd, const char __user *filename, int flags, int mode)
compat_sys_openat(unsigned int dfd, const char __user *filename, int flags, int mode)
{
return do_sys_open(dfd, filename, flags, mode);
}
Expand Down
6 changes: 3 additions & 3 deletions trunk/include/linux/syscalls.h
Original file line number Diff line number Diff line change
Expand Up @@ -559,12 +559,12 @@ asmlinkage long sys_newfstatat(int dfd, char __user *filename,
struct stat __user *statbuf, int flag);
asmlinkage long sys_readlinkat(int dfd, const char __user *path, char __user *buf,
int bufsiz);
asmlinkage long compat_sys_futimesat(int dfd, char __user *filename,
asmlinkage long compat_sys_futimesat(unsigned int dfd, char __user *filename,
struct compat_timeval __user *t);
asmlinkage long compat_sys_newfstatat(int dfd, char __user * filename,
asmlinkage long compat_sys_newfstatat(unsigned int dfd, char __user * filename,
struct compat_stat __user *statbuf,
int flag);
asmlinkage long compat_sys_openat(int dfd, const char __user *filename,
asmlinkage long compat_sys_openat(unsigned int dfd, const char __user *filename,
int flags, int mode);

#endif

0 comments on commit 3de817d

Please sign in to comment.