Signed-off-by: Andrew Morton <akpm@osdl.org>
---
25-sparc64-akpm/fs/compat_ioctl.c | 4 +---
1 files changed, 1 insertion(+), 3 deletions(-)
diff -puN fs/compat_ioctl.c~verify_area-cleanup-i386-and-misc-fix fs/compat_ioctl.c
--- 25-sparc64/fs/compat_ioctl.c~verify_area-cleanup-i386-and-misc-fix 2005-03-04 01:06:50.000000000 -0800
+++ 25-sparc64-akpm/fs/compat_ioctl.c 2005-03-04 01:07:35.000000000 -0800
@@ -2343,8 +2343,6 @@ static int mtd_rw_oob(unsigned int fd, u
static long
put_dirent32 (struct dirent *d, struct compat_dirent __user *d32)
{
- int ret;
-
if (!access_ok(VERIFY_WRITE, d32, sizeof(struct compat_dirent)))
return -EFAULT;
@@ -2354,7 +2352,7 @@ put_dirent32 (struct dirent *d, struct c
if (__copy_to_user(d32->d_name, d->d_name, d->d_reclen))
return -EFAULT;
- return ret;
+ return 0;
}
static int vfat_ioctl32(unsigned fd, unsigned cmd, unsigned long arg)
_