diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-05-11 03:33:06 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-05-11 03:50:02 -0400 |
| commit | 7a309490da98981558a07183786201f02a6341e2 (patch) | |
| tree | 204bfd3bc344dbb02be0b1eac29b956f6722e661 /arch/x86/ia32/sys_ia32.c | |
| parent | 9a8709d44139748fe2e0ab56d20d8c384c8b65ad (diff) | |
| parent | 091bf7624d1c90cec9e578a18529f615213ff847 (diff) | |
Merge commit 'v2.6.30-rc5' into x86/apic
Merge reason: this branch was on a .30-rc2 base - sync it up with
all the latest fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/ia32/sys_ia32.c')
| -rw-r--r-- | arch/x86/ia32/sys_ia32.c | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/arch/x86/ia32/sys_ia32.c b/arch/x86/ia32/sys_ia32.c index efac92fd1efb..085a8c35f149 100644 --- a/arch/x86/ia32/sys_ia32.c +++ b/arch/x86/ia32/sys_ia32.c | |||
| @@ -129,21 +129,12 @@ asmlinkage long sys32_fstatat(unsigned int dfd, char __user *filename, | |||
| 129 | struct stat64 __user *statbuf, int flag) | 129 | struct stat64 __user *statbuf, int flag) |
| 130 | { | 130 | { |
| 131 | struct kstat stat; | 131 | struct kstat stat; |
| 132 | int error = -EINVAL; | 132 | int error; |
| 133 | 133 | ||
| 134 | if ((flag & ~AT_SYMLINK_NOFOLLOW) != 0) | 134 | error = vfs_fstatat(dfd, filename, &stat, flag); |
| 135 | goto out; | 135 | if (error) |
| 136 | 136 | return error; | |
| 137 | if (flag & AT_SYMLINK_NOFOLLOW) | 137 | return cp_stat64(statbuf, &stat); |
| 138 | error = vfs_lstat_fd(dfd, filename, &stat); | ||
| 139 | else | ||
| 140 | error = vfs_stat_fd(dfd, filename, &stat); | ||
| 141 | |||
| 142 | if (!error) | ||
| 143 | error = cp_stat64(statbuf, &stat); | ||
| 144 | |||
| 145 | out: | ||
| 146 | return error; | ||
| 147 | } | 138 | } |
| 148 | 139 | ||
| 149 | /* | 140 | /* |