Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
  [PATCH] deal with the first call of ->show() generating no output
  [PATCH] fix ->llseek() for a bunch of directories
  [PATCH] fix regular readdir() and friends
  [PATCH] fix hpux_getdents()
  [PATCH] fix osf_getdirents()
  [PATCH] ntfs: use d_add_ci
  [PATCH] change d_add_ci argument ordering
  [PATCH] fix efs_lookup()
  [PATCH] proc: inode number fixlet

1 files changed, 12 insertions, 7 deletions

diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c
index 6e943135f0e0..8509dad31204 100644
--- a/arch/alpha/kernel/osf_sys.c
+++ b/arch/alpha/kernel/osf_sys.c
@@ -121,24 +121,29 @@ osf_filldir(void *__buf, const char *name, int namlen, loff_t offset,
         if (reclen > buf->count)
                 return -EINVAL;
         d_ino = ino;
-        if (sizeof(d_ino) < sizeof(ino) && d_ino != ino)
+        if (sizeof(d_ino) < sizeof(ino) && d_ino != ino) {
+                buf->error = -EOVERFLOW;
                 return -EOVERFLOW;
+        }
         if (buf->basep) {
                 if (put_user(offset, buf->basep))
-                        return -EFAULT;
+                        goto Efault;
                 buf->basep = NULL;
         }
         dirent = buf->dirent;
-        put_user(d_ino, &dirent->d_ino);
-        put_user(namlen, &dirent->d_namlen);
-        put_user(reclen, &dirent->d_reclen);
-        if (copy_to_user(dirent->d_name, name, namlen) ||
+        if (put_user(d_ino, &dirent->d_ino) ||
+            put_user(namlen, &dirent->d_namlen) ||
+            put_user(reclen, &dirent->d_reclen) ||
+            copy_to_user(dirent->d_name, name, namlen) ||
             put_user(0, dirent->d_name + namlen))
-                return -EFAULT;
+                goto Efault;
         dirent = (void __user *)dirent + reclen;
         buf->dirent = dirent;
         buf->count -= reclen;
         return 0;
+Efault:
+        buf->error = -EFAULT;
+        return -EFAULT;
 }
 
 asmlinkage int