libext2fs: fix ext2fs_llseek on i386

[android-x86/external-e2fsprogs.git] / lib / ext2fs / llseek.c

diff --git a/lib/ext2fs/llseek.c b/lib/ext2fs/llseek.c
index b0576e4..c3a98a2 100644 (file)
--- a/lib/ext2fs/llseek.c
+++ b/lib/ext2fs/llseek.c
@@ -90,17 +90,14 @@ static ext2_loff_t my_llseek (int fd, ext2_loff_t offset, int origin)
 
 ext2_loff_t ext2fs_llseek (int fd, ext2_loff_t offset, int origin)
 {
+#if SIZEOF_OFF_T >= SIZEOF_LONG_LONG
+       return lseek (fd, offset, origin);
+#else
        ext2_loff_t result;
        static int do_compat = 0;
 
-       if ((sizeof(off_t) >= sizeof(ext2_loff_t)) ||
-           (offset < ((ext2_loff_t) 1 << ((sizeof(off_t)*8) -1))))
-               return lseek(fd, (off_t) offset, origin);
-
-       if (do_compat) {
-               errno = EINVAL;
-               return -1;
-       }
+       if (do_compat)
+               goto fallback;
 
        result = my_llseek (fd, offset, origin);
        if (result == -1 && errno == ENOSYS) {
@@ -109,9 +106,14 @@ ext2_loff_t ext2fs_llseek (int fd, ext2_loff_t offset, int origin)
                 * which does not support the llseek system call
                 */
                do_compat++;
+       fallback:
+               if (offset < ((ext2_loff_t) 1 << ((sizeof(off_t)*8) -1)))
+                       return lseek(fd, (off_t) offset, origin);
                errno = EINVAL;
+               return -1;
        }
        return result;
+#endif
 }
 
 #else /* !linux */