1 files changed, 8 insertions, 14 deletions

diff --git a/fs/compat.c b/fs/compat.c
index 5f9ec449c799..cb36245f9fe0 100644
--- a/fs/compat.c
+++ b/fs/compat.c
@@ -869,7 +869,7 @@ asmlinkage long compat_sys_old_readdir(unsigned int fd,
         buf.dirent = dirent;
 
         error = vfs_readdir(file, compat_fillonedir, &buf);
-        if (error >= 0)
+        if (buf.result)
                 error = buf.result;
 
         fput(file);
@@ -956,9 +956,8 @@ asmlinkage long compat_sys_getdents(unsigned int fd,
         buf.error = 0;
 
         error = vfs_readdir(file, compat_filldir, &buf);
-        if (error < 0)
-                goto out_putf;
-        error = buf.error;
+        if (error >= 0)
+                error = buf.error;
         lastdirent = buf.previous;
         if (lastdirent) {
                 if (put_user(file->f_pos, &lastdirent->d_off))
@@ -966,8 +965,6 @@ asmlinkage long compat_sys_getdents(unsigned int fd,
                 else
                         error = count - buf.count;
         }
-
-out_putf:
         fput(file);
 out:
         return error;
@@ -1047,19 +1044,16 @@ asmlinkage long compat_sys_getdents64(unsigned int fd,
         buf.error = 0;
 
         error = vfs_readdir(file, compat_filldir64, &buf);
-        if (error < 0)
-                goto out_putf;
-        error = buf.error;
+        if (error >= 0)
+                error = buf.error;
         lastdirent = buf.previous;
         if (lastdirent) {
                 typeof(lastdirent->d_off) d_off = file->f_pos;
-                error = -EFAULT;
                 if (__put_user_unaligned(d_off, &lastdirent->d_off))
-                        goto out_putf;
-                error = count - buf.count;
+                        error = -EFAULT;
+                else
+                        error = count - buf.count;
         }
-
-out_putf:
         fput(file);
 out:
         return error;