Merge to Fedora kernel-2.6.7-1.492

[linux-2.6.git] / fs / compat.c

diff --git a/fs/compat.c b/fs/compat.c
index 0d61f0f..07f06a3 100644 (file)
--- a/fs/compat.c
+++ b/fs/compat.c
@@ -269,7 +269,7 @@ static void ioctl32_insert_translation(struct ioctl_trans *trans)
                t = ioctl32_hash_table[hash];
                while (t->next)
                        t = t->next;
-               trans->next = 0;
+               trans->next = NULL;
                t->next = trans;
        }
 }
@@ -824,7 +824,7 @@ static int compat_fillonedir(void *__buf, const char *name, int namlen,
                return -EINVAL;
        buf->result++;
        dirent = buf->dirent;
-       if (!access_ok(VERIFY_WRITE, (unsigned long)dirent,
+       if (!access_ok(VERIFY_WRITE, dirent,
                        (unsigned long)(dirent->d_name + namlen + 1) -
                                (unsigned long)dirent))
                goto efault;