[PATCH] Enable compilation of fs/readdir.c for gcc 2.95.2

• Next message: Barry K. Nathan: "[BUG] 2.2.24-rc2/2.4.18/2.4.20 UMSDOS hardlink OOPS"
• Previous message: Rusty Russell: "Re: [PATCH] Overzealous permenant mark removed"
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

Hi there,

if you also have problems compiling 2.5.5x, then your compiler is
too old as is mine.

Anyway, since I don't like to upgrade now, I hacked the offending
file fs/readdir.c and can compile a kernel again ;-)

Have fun!

Ingo Oeser

diff -Naur linux-2.5.53-mm2/fs/readdir.c linux-2.5.53-mm2-ioe/fs/readdir.c
--- linux-2.5.53-mm2/fs/readdir.c Fri Dec 27 13:49:53 2002
+++ linux-2.5.53-mm2-ioe/fs/readdir.c Mon Dec 30 21:51:53 2002
@@ -134,18 +134,18 @@
                 return -EINVAL;
         dirent = buf->previous;
         if (dirent) {
- if (__put_user(offset, &dirent->d_off))
+ if (put_user(offset, &dirent->d_off))
                         goto efault;
         }
         dirent = buf->current_dir;
         buf->previous = dirent;
- if (__put_user(ino, &dirent->d_ino))
+ if (put_user(ino, &dirent->d_ino))
                 goto efault;
- if (__put_user(reclen, &dirent->d_reclen))
+ if (put_user(reclen, &dirent->d_reclen))
                 goto efault;
         if (copy_to_user(dirent->d_name, name, namlen))
                 goto efault;
- if (__put_user(0, dirent->d_name + namlen))
+ if (put_user(0, dirent->d_name + namlen))
                 goto efault;
         ((char *) dirent) += reclen;
         buf->current_dir = dirent;
@@ -226,22 +226,22 @@
                 return -EINVAL;
         dirent = buf->previous;
         if (dirent) {
- if (__put_user(offset, &dirent->d_off))
+ if (put_user(offset, &dirent->d_off))
                         goto efault;
         }
         dirent = buf->current_dir;
         buf->previous = dirent;
- if (__put_user(ino, &dirent->d_ino))
+ if (put_user(ino, &dirent->d_ino))
                 goto efault;
- if (__put_user(0, &dirent->d_off))
+ if (put_user(0, &dirent->d_off))
                 goto efault;
- if (__put_user(reclen, &dirent->d_reclen))
+ if (put_user(reclen, &dirent->d_reclen))
                 goto efault;
- if (__put_user(d_type, &dirent->d_type))
+ if (put_user(d_type, &dirent->d_type))
                 goto efault;
         if (copy_to_user(dirent->d_name, name, namlen))
                 goto efault;
- if (__put_user(0, dirent->d_name + namlen))
+ if (put_user(0, dirent->d_name + namlen))
                 goto efault;
         ((char *) dirent) += reclen;
         buf->current_dir = dirent;
@@ -280,7 +280,9 @@
         if (lastdirent) {
                 struct linux_dirent64 d;
                 d.d_off = file->f_pos;
- __put_user(d.d_off, &lastdirent->d_off);
+ error = -EFAULT;
+ if (put_user(d.d_off, &lastdirent->d_off))
+ goto out;
                 error = count - buf.count;
         }
 

-- 
Science is what we can tell a computer. Art is everything else. --- D.E.Knuth
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

• Next message: Barry K. Nathan: "[BUG] 2.2.24-rc2/2.4.18/2.4.20 UMSDOS hardlink OOPS"
• Previous message: Rusty Russell: "Re: [PATCH] Overzealous permenant mark removed"
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

This archive was generated by hypermail 2b29 : Tue Dec 31 2002 - 22:00:18 EST