45 files changed, 212 insertions, 659 deletions
diff --git a/fs/9p/vfs_file.c b/fs/9p/vfs_file.c
index bbc3cc63854f..89c849da8504 100644
--- a/fs/9p/vfs_file.c
+++ b/fs/9p/vfs_file.c
@@ -32,7 +32,6 @@
 #include <linux/string.h>
 #include <linux/smp_lock.h>
 #include <linux/inet.h>
-#include <linux/version.h>
 #include <linux/list.h>
 #include <asm/uaccess.h>
 #include <linux/idr.h>
diff --git a/fs/Kconfig b/fs/Kconfig
index 7d6ae369ce44..d5255e627b5f 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -1601,9 +1601,10 @@ config CIFS
          PC operating systems.  The CIFS protocol is fully supported by 
          file servers such as Windows 2000 (including Windows 2003, NT 4  
          and Windows XP) as well by Samba (which provides excellent CIFS
-          server support for Linux and many other operating systems). Currently
+          server support for Linux and many other operating systems). Limited
-          you must use the smbfs client filesystem to access older SMB servers
+          support for Windows ME and similar servers is provided as well. 
-          such as Windows 9x and OS/2.
+          You must use the smbfs client filesystem to access older SMB servers
+          such as OS/2 and DOS.
          The intent of the cifs module is to provide an advanced
          network file system client for mounting to CIFS compliant servers, 
@@ -1614,7 +1615,7 @@ config CIFS
          cifs if running only a (Samba) server. It is possible to enable both
          smbfs and cifs (e.g. if you are using CIFS for accessing Windows 2003
          and Samba 3 servers, and smbfs for accessing old servers). If you need 
-          to mount to Samba or Windows 2003 servers from this machine, say Y.
+          to mount to Samba or Windows from this machine, say Y.
 config CIFS_STATS
        bool "CIFS statistics"
@@ -1623,8 +1624,22 @@ config CIFS_STATS
          Enabling this option will cause statistics for each server share
          mounted by the cifs client to be displayed in /proc/fs/cifs/Stats
+config CIFS_STATS2
+        bool "CIFS extended statistics"
+        depends on CIFS_STATS
+        help
+          Enabling this option will allow more detailed statistics on SMB
+          request timing to be displayed in /proc/fs/cifs/DebugData and also
+          allow optional logging of slow responses to dmesg (depending on the
+          value of /proc/fs/cifs/cifsFYI, see fs/cifs/README for more details).
+          These additional statistics may have a minor effect on performance
+          and memory utilization.
+          Unless you are a developer or are doing network performance analysis
+          or tuning, say N.
 config CIFS_XATTR
-        bool "CIFS extended attributes (EXPERIMENTAL)"
+        bool "CIFS extended attributes"
        depends on CIFS
        help
          Extended attributes are name:value pairs associated with inodes by
@@ -1636,11 +1651,11 @@ config CIFS_XATTR
          prefaced by the user namespace prefix. The system namespace
          (used by some filesystems to store ACLs) is not supported at
          this time.
-                                                                                                    
          If unsure, say N.
 config CIFS_POSIX
-        bool "CIFS POSIX Extensions (EXPERIMENTAL)"
+        bool "CIFS POSIX Extensions"
        depends on CIFS_XATTR
        help
          Enabling this option will cause the cifs client to attempt to
@@ -1653,10 +1668,28 @@ config CIFS_POSIX
 config CIFS_EXPERIMENTAL
          bool "CIFS Experimental Features (EXPERIMENTAL)"
-          depends on CIFS
+          depends on CIFS && EXPERIMENTAL
+          help
+            Enables cifs features under testing. These features are
+            experimental and currently include support for writepages
+            (multipage writebehind performance improvements) and directory
+            change notification ie fcntl(F_DNOTIFY) as well as some security
+            improvements.  Some also depend on setting at runtime the
+            pseudo-file /proc/fs/cifs/Experimental (which is disabled by
+            default). See the file fs/cifs/README for more details.
+            If unsure, say N.
+config CIFS_UPCALL
+          bool "CIFS Kerberos/SPNEGO advanced session setup (EXPERIMENTAL)"
+          depends on CIFS_EXPERIMENTAL
+          select CONNECTOR
          help
-            Enables cifs features under testing. These features
+            Enables an upcall mechanism for CIFS which will be used to contact
-            are highly experimental.  If unsure, say N.
+            userspace helper utilities to provide SPNEGO packaged Kerberos
+            tickets which are needed to mount to certain secure servers
+            (for which more secure Kerberos authentication is required). If
+            unsure, say N.
 config NCP_FS
        tristate "NCP file system support (to mount NetWare volumes)"
diff --git a/fs/adfs/adfs.h b/fs/adfs/adfs.h
index fd528433de43..f6cd01352cc8 100644
--- a/fs/adfs/adfs.h
+++ b/fs/adfs/adfs.h
@@ -12,7 +12,6 @@
 #define ADFS_NDA_PUBLIC_READ    (1 << 5)
 #define ADFS_NDA_PUBLIC_WRITE   (1 << 6)
-#include <linux/version.h>
 #include "dir_f.h"
 struct buffer_head;
diff --git a/fs/binfmt_misc.c b/fs/binfmt_misc.c
index 8ae0db6cd69c..2568eb41cb3a 100644
--- a/fs/binfmt_misc.c
+++ b/fs/binfmt_misc.c
@@ -150,7 +150,7 @@ static int load_misc_binary(struct linux_binprm *bprm, struct pt_regs *regs)
                /* if the binary is not readable than enforce mm->dumpable=0
                   regardless of the interpreter's permissions */
-                if (permission(bprm->file->f_dentry->d_inode, MAY_READ, NULL))
+                if (file_permission(bprm->file, MAY_READ))
                        bprm->interp_flags |= BINPRM_FLAGS_ENFORCE_NONDUMP;
                allow_write_access(bprm->file);
diff --git a/fs/cifs/CHANGES b/fs/cifs/CHANGES
index 5bab24f59053..eab3750cf304 100644
--- a/fs/cifs/CHANGES
+++ b/fs/cifs/CHANGES
@@ -2,7 +2,7 @@ Version 1.39
 ------------
 Defer close of a file handle slightly if pending writes depend on that file handle
 (this reduces the EBADF bad file handle errors that can be logged under heavy
-stress on writes).
+stress on writes). Modify cifs Kconfig options to expose CONFIG_CIFS_STATS2 
 Version 1.38
 ------------
diff --git a/fs/cifs/cifs_unicode.c b/fs/cifs/cifs_unicode.c
index 99a096d3f84d..4e12053f0806 100644
--- a/fs/cifs/cifs_unicode.c
+++ b/fs/cifs/cifs_unicode.c
@@ -74,10 +74,11 @@ cifs_strtoUCS(wchar_t * to, const char *from, int len,
                        cERROR(1,
                               ("cifs_strtoUCS: char2uni returned %d",
                                charlen));
-                        to[i] = cpu_to_le16(0x003f);    /* a question mark */
+                        /* A question mark */
+                        to[i] = (wchar_t)cpu_to_le16(0x003f);
                        charlen = 1;
                } else 
-                        to[i] = cpu_to_le16(to[i]);
+                        to[i] = (wchar_t)cpu_to_le16(to[i]);
        }
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
index 877095a1192a..682b0235ad9a 100644
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@ -405,6 +405,7 @@ static struct quotactl_ops cifs_quotactl_ops = {
 };
 #endif
+#ifdef CONFIG_CIFS_EXPERIMENTAL
 static void cifs_umount_begin(struct super_block * sblock)
 {
        struct cifs_sb_info *cifs_sb;
@@ -422,16 +423,18 @@ static void cifs_umount_begin(struct super_block * sblock)
                tcon->tidStatus = CifsExiting;
        up(&tcon->tconSem);
+        /* cancel_brl_requests(tcon); */
+        /* cancel_notify_requests(tcon); */
        if(tcon->ses && tcon->ses->server)
        {
-                cERROR(1,("wake up tasks now - umount begin not complete"));
+                cFYI(1,("wake up tasks now - umount begin not complete"));
                wake_up_all(&tcon->ses->server->request_q);
        }
 /* BB FIXME - finish add checks for tidStatus BB */
        return;
 }
-        
+#endif  
 static int cifs_remount(struct super_block *sb, int *flags, char *data)
 {
@@ -450,7 +453,9 @@ struct super_operations cifs_super_ops = {
   unless later we add lazy close of inodes or unless the kernel forgets to call
   us with the same number of releases (closes) as opens */
        .show_options = cifs_show_options,
-/*      .umount_begin   = cifs_umount_begin, */ /* BB finish in the future */
+#ifdef CONFIG_CIFS_EXPERIMENTAL
+        .umount_begin   = cifs_umount_begin,
+#endif
        .remount_fs = cifs_remount,
 };
diff --git a/fs/cifs/cifsproto.h b/fs/cifs/cifsproto.h
index d301149b1bb0..1b73f4f4c5ce 100644
--- a/fs/cifs/cifsproto.h
+++ b/fs/cifs/cifsproto.h
@@ -242,11 +242,11 @@ extern int CIFSSMBWrite2(const int xid, struct cifsTconInfo *tcon,
                        const int netfid, const unsigned int count,
                        const __u64 offset, unsigned int *nbytes, 
                        struct kvec *iov, const int nvec, const int long_op);
+#endif /* CONFIG_CIFS_EXPERIMENTAL */
 extern int CIFSGetSrvInodeNumber(const int xid, struct cifsTconInfo *tcon,
                        const unsigned char *searchName, __u64 * inode_number,
                        const struct nls_table *nls_codepage, 
                        int remap_special_chars);
-#endif /* CONFIG_CIFS_EXPERIMENTAL */
 extern int cifs_convertUCSpath(char *target, const __le16 *source, int maxlen,
                        const struct nls_table * codepage);
 extern int cifsConvertToUCS(__le16 * target, const char *source, int maxlen,
diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c
index 9312bfc56682..a53c596e1082 100644
--- a/fs/cifs/cifssmb.c
+++ b/fs/cifs/cifssmb.c
@@ -2959,7 +2959,6 @@ CIFSFindClose(const int xid, struct cifsTconInfo *tcon, const __u16 searchHandle
        return rc;
 }
-#ifdef CONFIG_CIFS_EXPERIMENTAL
 int
 CIFSGetSrvInodeNumber(const int xid, struct cifsTconInfo *tcon,
                const unsigned char *searchName,
@@ -3053,7 +3052,6 @@ GetInodeNumOut:
                goto GetInodeNumberRetry;
        return rc;
 }
-#endif /* CIFS_EXPERIMENTAL */
 int
 CIFSGetDFSRefer(const int xid, struct cifsSesInfo *ses,
diff --git a/fs/cifs/cn_cifs.h b/fs/cifs/cn_cifs.h
new file mode 100644
index 000000000000..ea59ccac2eb1
--- /dev/null
+++ b/fs/cifs/cn_cifs.h
@@ -0,0 +1,37 @@
+/*
+ *   fs/cifs/cn_cifs.h
+ *
+ *   Copyright (c) International Business Machines  Corp., 2002
+ *   Author(s): Steve French (sfrench@us.ibm.com)
+ *
+ *   This library is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU Lesser General Public License as published
+ *   by the Free Software Foundation; either version 2.1 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This library is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
+ *   the GNU Lesser General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Lesser General Public License
+ *   along with this library; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+#ifndef _CN_CIFS_H
+#define _CN_CIFS_H
+#ifdef CONFIG_CIFS_UPCALL
+#include <linux/types.h>
+#include <linux/connector.h>
+struct cifs_upcall {
+        char signature[4]; /* CIFS */
+        enum command {
+                CIFS_GET_IP = 0x00000001,   /* get ip address for hostname */
+                CIFS_GET_SECBLOB = 0x00000002, /* get SPNEGO wrapped blob */
+        } command;
+        /* union cifs upcall data follows */
+};
+#endif /* CIFS_UPCALL */
+#endif /* _CN_CIFS_H */
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index 450ab75d6546..2cb620716bc1 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -42,6 +42,7 @@
 #include "ntlmssp.h"
 #include "nterr.h"
 #include "rfc1002pdu.h"
+#include "cn_cifs.h"
 #define CIFS_PORT 445
 #define RFC1001_PORT 139
diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c
index 912d401600f6..923d071163b2 100644
--- a/fs/cifs/inode.c
+++ b/fs/cifs/inode.c
@@ -283,7 +283,6 @@ int cifs_get_inode_info(struct inode **pinode,
                           there Windows server or network appliances for which
                           IndexNumber field is not guaranteed unique? */
-#ifdef CONFIG_CIFS_EXPERIMENTAL         
                        if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SERVER_INUM){
                                int rc1 = 0;
                                __u64 inode_num;
@@ -299,7 +298,6 @@ int cifs_get_inode_info(struct inode **pinode,
                                } else /* do we need cast or hash to ino? */
                                        (*pinode)->i_ino = inode_num;
                        } /* else ino incremented to unique num in new_inode*/
-#endif /* CIFS_EXPERIMENTAL */
                        insert_inode_hash(*pinode);
                }
                inode = *pinode;
diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c
index 4909754ea84a..26300fccb4fc 100644
--- a/fs/compat_ioctl.c
+++ b/fs/compat_ioctl.c
@@ -840,146 +840,6 @@ static int hdio_getgeo(unsigned int fd, unsigned int cmd, unsigned long arg)
        return err ? -EFAULT : 0;
 }
-struct fb_fix_screeninfo32 {
-        char                    id[16];
-        compat_caddr_t  smem_start;
-        u32                     smem_len;
-        u32                     type;
-        u32                     type_aux;
-        u32                     visual;
-        u16                     xpanstep;
-        u16                     ypanstep;
-        u16                     ywrapstep;
-        u32                     line_length;
-        compat_caddr_t  mmio_start;
-        u32                     mmio_len;
-        u32                     accel;
-        u16                     reserved[3];
-};
-struct fb_cmap32 {
-        u32                     start;
-        u32                     len;
-        compat_caddr_t  red;
-        compat_caddr_t  green;
-        compat_caddr_t  blue;
-        compat_caddr_t  transp;
-};
-static int fb_getput_cmap(unsigned int fd, unsigned int cmd, unsigned long arg)
-{
-        struct fb_cmap_user __user *cmap;
-        struct fb_cmap32 __user *cmap32;
-        __u32 data;
-        int err;
-        cmap = compat_alloc_user_space(sizeof(*cmap));
-        cmap32 = compat_ptr(arg);
-        if (copy_in_user(&cmap->start, &cmap32->start, 2 * sizeof(__u32)))
-                return -EFAULT;
-        if (get_user(data, &cmap32->red) ||
-            put_user(compat_ptr(data), &cmap->red) ||
-            get_user(data, &cmap32->green) ||
-            put_user(compat_ptr(data), &cmap->green) ||
-            get_user(data, &cmap32->blue) ||
-            put_user(compat_ptr(data), &cmap->blue) ||
-            get_user(data, &cmap32->transp) ||
-            put_user(compat_ptr(data), &cmap->transp))
-                return -EFAULT;
-        err = sys_ioctl(fd, cmd, (unsigned long) cmap);
-        if (!err) {
-                if (copy_in_user(&cmap32->start,
-                                 &cmap->start,
-                                 2 * sizeof(__u32)))
-                        err = -EFAULT;
-        }
-        return err;
-}
-static int do_fscreeninfo_to_user(struct fb_fix_screeninfo *fix,
-                                  struct fb_fix_screeninfo32 __user *fix32)
-{
-        __u32 data;
-        int err;
-        err = copy_to_user(&fix32->id, &fix->id, sizeof(fix32->id));
-        data = (__u32) (unsigned long) fix->smem_start;
-        err |= put_user(data, &fix32->smem_start);
-        err |= put_user(fix->smem_len, &fix32->smem_len);
-        err |= put_user(fix->type, &fix32->type);
-        err |= put_user(fix->type_aux, &fix32->type_aux);
-        err |= put_user(fix->visual, &fix32->visual);
-        err |= put_user(fix->xpanstep, &fix32->xpanstep);
-        err |= put_user(fix->ypanstep, &fix32->ypanstep);
-        err |= put_user(fix->ywrapstep, &fix32->ywrapstep);
-        err |= put_user(fix->line_length, &fix32->line_length);
-        data = (__u32) (unsigned long) fix->mmio_start;
-        err |= put_user(data, &fix32->mmio_start);
-        err |= put_user(fix->mmio_len, &fix32->mmio_len);
-        err |= put_user(fix->accel, &fix32->accel);
-        err |= copy_to_user(fix32->reserved, fix->reserved,
-                            sizeof(fix->reserved));
-        return err;
-}
-static int fb_get_fscreeninfo(unsigned int fd, unsigned int cmd, unsigned long arg)
-{
-        mm_segment_t old_fs;
-        struct fb_fix_screeninfo fix;
-        struct fb_fix_screeninfo32 __user *fix32;
-        int err;
-        fix32 = compat_ptr(arg);
-        old_fs = get_fs();
-        set_fs(KERNEL_DS);
-        err = sys_ioctl(fd, cmd, (unsigned long) &fix);
-        set_fs(old_fs);
-        if (!err)
-                err = do_fscreeninfo_to_user(&fix, fix32);
-        return err;
-}
-static int fb_ioctl_trans(unsigned int fd, unsigned int cmd, unsigned long arg)
-{
-        int err;
-        switch (cmd) {
-        case FBIOGET_FSCREENINFO:
-                err = fb_get_fscreeninfo(fd,cmd, arg);
-                break;
-        case FBIOGETCMAP:
-        case FBIOPUTCMAP:
-                err = fb_getput_cmap(fd, cmd, arg);
-                break;
-        default:
-                do {
-                        static int count;
-                        if (++count <= 20)
-                                printk("%s: Unknown fb ioctl cmd fd(%d) "
-                                       "cmd(%08x) arg(%08lx)\n",
-                                       __FUNCTION__, fd, cmd, arg);
-                } while(0);
-                err = -ENOSYS;
-                break;
-        };
-        return err;
-}
 static int hdio_ioctl_trans(unsigned int fd, unsigned int cmd, unsigned long arg)
 {
        mm_segment_t old_fs = get_fs();
@@ -2953,10 +2813,7 @@ HANDLE_IOCTL(BLKGETSIZE, w_long)
 HANDLE_IOCTL(0x1260, broken_blkgetsize)
 HANDLE_IOCTL(BLKFRAGET, w_long)
 HANDLE_IOCTL(BLKSECTGET, w_long)
-HANDLE_IOCTL(FBIOGET_FSCREENINFO, fb_ioctl_trans)
 HANDLE_IOCTL(BLKPG, blkpg_ioctl_trans)
-HANDLE_IOCTL(FBIOGETCMAP, fb_ioctl_trans)
-HANDLE_IOCTL(FBIOPUTCMAP, fb_ioctl_trans)
 HANDLE_IOCTL(HDIO_GET_KEEPSETTINGS, hdio_ioctl_trans)
 HANDLE_IOCTL(HDIO_GET_UNMASKINTR, hdio_ioctl_trans)
 HANDLE_IOCTL(HDIO_GET_DMA, hdio_ioctl_trans)
@@ -3051,6 +2908,16 @@ HANDLE_IOCTL(TIOCSSERIAL, serial_struct_ioctl)
 COMPATIBLE_IOCTL(TIOCGLTC)
 COMPATIBLE_IOCTL(TIOCSLTC)
 #endif
+#ifdef TIOCSTART
+/*
+ * For these two we have defintions in ioctls.h and/or termios.h on
+ * some architectures but no actual implemention.  Some applications
+ * like bash call them if they are defined in the headers, so we provide
+ * entries here to avoid syslog message spew.
+ */
+COMPATIBLE_IOCTL(TIOCSTART)
+COMPATIBLE_IOCTL(TIOCSTOP)
+#endif
 /* Usbdevfs */
 HANDLE_IOCTL(USBDEVFS_CONTROL32, do_usbdevfs_control)
 HANDLE_IOCTL(USBDEVFS_BULK32, do_usbdevfs_bulk)
diff --git a/fs/exec.c b/fs/exec.c
index cd6c574557dc..c466fec5de20 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -135,7 +135,7 @@ asmlinkage long sys_uselib(const char __user * library)
        if (!S_ISREG(nd.dentry->d_inode->i_mode))
                goto exit;
-        error = permission(nd.dentry->d_inode, MAY_READ | MAY_EXEC, &nd);
+        error = vfs_permission(&nd, MAY_READ | MAY_EXEC);
        if (error)
                goto exit;
@@ -495,7 +495,7 @@ struct file *open_exec(const char *name)
                file = ERR_PTR(-EACCES);
                if (!(nd.mnt->mnt_flags & MNT_NOEXEC) &&
                    S_ISREG(inode->i_mode)) {
-                        int err = permission(inode, MAY_EXEC, &nd);
+                        int err = vfs_permission(&nd, MAY_EXEC);
                        if (!err && !(inode->i_mode & 0111))
                                err = -EACCES;
                        file = ERR_PTR(err);
@@ -590,6 +590,7 @@ static inline int de_thread(struct task_struct *tsk)
        struct signal_struct *sig = tsk->signal;
        struct sighand_struct *newsighand, *oldsighand = tsk->sighand;
        spinlock_t *lock = &oldsighand->siglock;
+        struct task_struct *leader = NULL;
        int count;
        /*
@@ -665,7 +666,7 @@ static inline int de_thread(struct task_struct *tsk)
         * and to assume its PID:
         */
        if (!thread_group_leader(current)) {
-                struct task_struct *leader = current->group_leader, *parent;
+                struct task_struct *parent;
                struct dentry *proc_dentry1, *proc_dentry2;
                unsigned long exit_state, ptrace;
@@ -674,6 +675,7 @@ static inline int de_thread(struct task_struct *tsk)
                 * It should already be zombie at this point, most
                 * of the time.
                 */
+                leader = current->group_leader;
                while (leader->exit_state != EXIT_ZOMBIE)
                        yield();
@@ -733,7 +735,6 @@ static inline int de_thread(struct task_struct *tsk)
                proc_pid_flush(proc_dentry2);
                BUG_ON(exit_state != EXIT_ZOMBIE);
-                release_task(leader);
        }
        /*
@@ -743,8 +744,11 @@ static inline int de_thread(struct task_struct *tsk)
        sig->flags = 0;
 no_thread_group:
-        BUG_ON(atomic_read(&sig->count) != 1);
        exit_itimers(sig);
+        if (leader)
+                release_task(leader);
+        BUG_ON(atomic_read(&sig->count) != 1);
        if (atomic_read(&oldsighand->count) == 1) {
                /*
@@ -892,7 +896,7 @@ int flush_old_exec(struct linux_binprm * bprm)
        flush_thread();
        if (bprm->e_uid != current->euid || bprm->e_gid != current->egid || 
-            permission(bprm->file->f_dentry->d_inode,MAY_READ, NULL) ||
+            file_permission(bprm->file, MAY_READ) ||
            (bprm->interp_flags & BINPRM_FLAGS_ENFORCE_NONDUMP)) {
                suid_keys(current);
                current->mm->dumpable = suid_dumpable;
diff --git a/fs/ext2/CHANGES b/fs/ext2/CHANGES
deleted file mode 100644
index aa5aaf0e5911..000000000000
--- a/fs/ext2/CHANGES
+++ /dev/null
@@ -1,157 +0,0 @@
-Changes from version 0.5a to version 0.5b
-=========================================
-        - Now that we have sysctl(), the immutable flag cannot be changed when
-          the system is running at security level > 0.
-        - Some cleanups in the code.
-        - More consistency checks on directories.
-        - The ext2.diff patch from Tom May <ftom@netcom.com> has been
-          integrated.  This patch replaces expensive "/" and "%" with
-          cheap ">>" and "&" where possible.
-Changes from version 0.5 to version 0.5a
-========================================
-        - Zero the partial block following the end of the file when a file
-          is truncated.
-        - Dates updated in the copyright.
-        - More checks when the filesystem is mounted: the count of blocks,
-          fragments, and inodes per group is checked against the block size.
-        - The buffers used by the error routines are now static variables, to
-          avoid using space on the kernel stack, as requested by Linus.
-        - Some cleanups in the error messages (some versions of syslog contain
-          a bug which truncates an error message if it contains '\n').
-        - Check that no data can be written to a file past the 2GB limit.
-        - The famous readdir() bug has been fixed by Stephen Tweedie.
-        - Added a revision level in the superblock.
-        - Full support for O_SYNC flag of the open system call.
-        - New mount options: `resuid=#uid' and `resgid=#gid'.  `resuid' causes
-          ext2fs to consider user #uid like root for the reserved blocks.
-          `resgid' acts the same way with group #gid.  New fields in the
-          superblock contain default values for resuid and resgid and can
-          be modified by tune2fs.
-          Idea comes from Rene Cougnenc <cougnenc@renux.frmug.fr.net>.
-        - New mount options: `bsddf' and `minixdf'.  `bsddf' causes ext2fs
-          to remove the blocks used for FS structures from the total block
-          count in statfs.  With `minixdf', ext2fs mimics Minix behavior
-          in statfs (i.e. it returns the total number of blocks on the
-          partition).  This is intended to make bde happy :-)
-        - New file attributes:
-          - Immutable files cannot be modified.  Data cannot be written to
-            these files.  They cannot be removed, renamed and new links cannot
-            be created.  Even root cannot modify the files.  He has to remove
-            the immutable attribute first.
-          - Append-only files: can only be written in append-mode when writing.
-            They cannot be removed, renamed and new links cannot be created.
-            Note: files may only be added to an append-only directory.
-          - No-dump files: the attribute is not used by the kernel.  My port
-            of dump uses it to avoid backing up files which are not important.
-        - New check in ext2_check_dir_entry: the inode number is checked.
-        - Support for big file systems: the copy of the FS descriptor is now
-          dynamically allocated (previous versions used a fixed size array).
-          This allows to mount 2GB+ FS.
-        - Reorganization of the ext2_inode structure to allow other operating
-          systems to create specific fields if they use ext2fs as their native
-          file system.  Currently, ext2fs is only implemented in Linux but
-          will soon be part of Gnu Hurd and of Masix.
-Changes from version 0.4b to version 0.5
-========================================
-        - New superblock fields: s_lastcheck and s_checkinterval added
-          by Uwe Ohse <uwe@tirka.gun.de> to implement timedependent checks
-          of the file system
-        - Real random numbers for secure rm added by Pierre del Perugia
-          <delperug@gla.ecoledoc.ibp.fr>
-        - The mount warnings related to the state of a fs are not printed
-          if the fs is mounted read-only, idea by Nick Holloway
-          <alfie@dcs.warwick.ac.uk>
-Changes from version 0.4a to version 0.4b
-=========================================
-        - Copyrights changed to include the name of my laboratory.
-        - Clean up of balloc.c and ialloc.c.
-        - More consistency checks.
-        - Block preallocation added by Stephen Tweedie.
-        - Direct reads of directories disallowed.
-        - Readahead implemented in readdir by Stephen Tweedie.
-        - Bugs in block and inodes allocation fixed.
-        - Readahead implemented in ext2_find_entry by Chip Salzenberg.
-        - New mount options:
-          `check=none|normal|strict'
-          `debug'
-          `errors=continue|remount-ro|panic'
-          `grpid', `bsdgroups'
-          `nocheck'
-          `nogrpid', `sysvgroups'
-        - truncate() now tries to deallocate contiguous blocks in a single call
-          to ext2_free_blocks().
-        - lots of cosmetic changes.
-Changes from version 0.4 to version 0.4a
-========================================
-        - the `sync' option support is now complete.  Version 0.4 was not
-          supporting it when truncating a file.  I have tested the synchronous
-          writes and they work but they make the system very slow :-(  I have
-          to work again on this to make it faster.
-        - when detecting an error on a mounted filesystem, version 0.4 used
-          to try to write a flag in the super block even if the filesystem had
-          been mounted read-only.  This is fixed.
-        - the `sb=#' option now causes the kernel code to use the filesystem
-          descriptors located at block #+1.  Version 0.4 used the superblock
-          backup located at block # but used the main copy of the descriptors.
-        - a new file attribute `S' is supported.  This attribute causes
-          synchronous writes but is applied to a file not to the entire file
-          system (thanks to Michael Kraehe <kraehe@bakunin.north.de> for
-          suggesting it).
-        - the directory cache is inhibited by default.  The cache management
-          code seems to be buggy and I have to look at it carefully before
-          using it again.
-        - deleting a file with the `s' attribute (secure deletion) causes its
-          blocks to be overwritten with random values not with zeros (thanks to
-          Michael A. Griffith <grif@cs.ucr.edu> for suggesting it).
-        - lots of cosmetic changes have been made.
-Changes from version 0.3 to version 0.4
-=======================================
-        - Three new mount options are supported: `check', `sync' and `sb=#'.
-          `check' tells the kernel code to make more consistency checks
-          when the file system is mounted.  Currently, the kernel code checks
-          that the blocks and inodes bitmaps are consistent with the free
-          blocks and inodes counts.  More checks will be added in future
-          releases.
-          `sync' tells the kernel code to use synchronous writes when updating
-          an inode, a bitmap, a directory entry or an indirect block.  This
-          can make the file system much slower but can be a big win for files
-          recovery in case of a crash (and we can now say to the BSD folks
-          that Linux also supports synchronous updates :-).
-          `sb=#' tells the kernel code to use an alternate super block instead
-          of its master copy.  `#' is the number of the block (counted in
-          1024 bytes blocks) which contains the alternate super block.
-          An ext2 file system typically contains backups of the super block
-          at blocks 8193, 16385, and so on.
-        - I have change the meaning of the valid flag used by e2fsck.  it
-          now contains the state of the file system.  If the kernel code
-          detects an inconsistency while the file system is mounted, it flags
-          it as erroneous and e2fsck will detect that on next run.
-        - The super block now contains a mount counter.  This counter is
-          incremented each time the file system is mounted read/write.   When
-          this counter becomes bigger than a maximal mount counts (also stored
-          in the super block), e2fsck checks the file system, even if it had
-          been unmounted cleanly, and resets this counter to 0.
-        - File attributes are now supported.  One can associate a set of
-          attributes to a file.  Three attributes are defined:
-          `c': the file is marked for automatic compression,
-          `s': the file is marked for secure deletion: when the file is
-          deleted, its blocks are zeroed and written back to the disk,
-          `u': the file is marked for undeletion: when the file is deleted,
-          its contents are saved to allow a future undeletion.
-          Currently, only the `s' attribute is implemented in the kernel
-          code.  Support for the other attributes will be added in a future
-          release.
-        - a few bugs related to times updates have been fixed by Bruce
-          Evans and me.
-        - a bug related to the links count of deleted inodes has been fixed.
-          Previous versions used to keep the links count set to 1 when a file
-          was deleted.  The new version now sets links_count to 0 when deleting
-          the last link.
-        - a race condition when deallocating an inode has been fixed by
-          Stephen Tweedie.
diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c
index 6591abef64d0..bb6908066494 100644
--- a/fs/ext2/balloc.c
+++ b/fs/ext2/balloc.c
@@ -624,76 +624,3 @@ unsigned long ext2_bg_num_gdb(struct super_block *sb, int group)
        return EXT2_SB(sb)->s_gdb_count;
 }
-#ifdef CONFIG_EXT2_CHECK
-/* Called at mount-time, super-block is locked */
-void ext2_check_blocks_bitmap (struct super_block * sb)
-{
-        struct buffer_head *bitmap_bh = NULL;
-        struct ext2_super_block * es;
-        unsigned long desc_count, bitmap_count, x, j;
-        unsigned long desc_blocks;
-        struct ext2_group_desc * desc;
-        int i;
-        es = EXT2_SB(sb)->s_es;
-        desc_count = 0;
-        bitmap_count = 0;
-        desc = NULL;
-        for (i = 0; i < EXT2_SB(sb)->s_groups_count; i++) {
-                desc = ext2_get_group_desc (sb, i, NULL);
-                if (!desc)
-                        continue;
-                desc_count += le16_to_cpu(desc->bg_free_blocks_count);
-                brelse(bitmap_bh);
-                bitmap_bh = read_block_bitmap(sb, i);
-                if (!bitmap_bh)
-                        continue;
-                if (ext2_bg_has_super(sb, i) &&
-                                !ext2_test_bit(0, bitmap_bh->b_data))
-                        ext2_error(sb, __FUNCTION__,
-                                   "Superblock in group %d is marked free", i);
-                desc_blocks = ext2_bg_num_gdb(sb, i);
-                for (j = 0; j < desc_blocks; j++)
-                        if (!ext2_test_bit(j + 1, bitmap_bh->b_data))
-                                ext2_error(sb, __FUNCTION__,
-                                           "Descriptor block #%ld in group "
-                                           "%d is marked free", j, i);
-                if (!block_in_use(le32_to_cpu(desc->bg_block_bitmap),
-                                        sb, bitmap_bh->b_data))
-                        ext2_error(sb, "ext2_check_blocks_bitmap",
-                                    "Block bitmap for group %d is marked free",
-                                    i);
-                if (!block_in_use(le32_to_cpu(desc->bg_inode_bitmap),
-                                        sb, bitmap_bh->b_data))
-                        ext2_error(sb, "ext2_check_blocks_bitmap",
-                                    "Inode bitmap for group %d is marked free",
-                                    i);
-                for (j = 0; j < EXT2_SB(sb)->s_itb_per_group; j++)
-                        if (!block_in_use(le32_to_cpu(desc->bg_inode_table) + j,
-                                                sb, bitmap_bh->b_data))
-                                ext2_error (sb, "ext2_check_blocks_bitmap",
-                                            "Block #%ld of the inode table in "
-                                            "group %d is marked free", j, i);
-                x = ext2_count_free(bitmap_bh, sb->s_blocksize);
-                if (le16_to_cpu(desc->bg_free_blocks_count) != x)
-                        ext2_error (sb, "ext2_check_blocks_bitmap",
-                                    "Wrong free blocks count for group %d, "
-                                    "stored = %d, counted = %lu", i,
-                                    le16_to_cpu(desc->bg_free_blocks_count), x);
-                bitmap_count += x;
-        }
-        if (le32_to_cpu(es->s_free_blocks_count) != bitmap_count)
-                ext2_error (sb, "ext2_check_blocks_bitmap",
-                        "Wrong free blocks count in super block, "
-                        "stored = %lu, counted = %lu",
-                        (unsigned long)le32_to_cpu(es->s_free_blocks_count),
-                        bitmap_count);
-        brelse(bitmap_bh);
-}
-#endif
diff --git a/fs/ext2/ialloc.c b/fs/ext2/ialloc.c
index e2d6208633a7..74714af4ae69 100644
--- a/fs/ext2/ialloc.c
+++ b/fs/ext2/ialloc.c
@@ -700,43 +700,3 @@ unsigned long ext2_count_dirs (struct super_block * sb)
        return count;
 }
-#ifdef CONFIG_EXT2_CHECK
-/* Called at mount-time, super-block is locked */
-void ext2_check_inodes_bitmap (struct super_block * sb)
-{
-        struct ext2_super_block * es = EXT2_SB(sb)->s_es;
-        unsigned long desc_count = 0, bitmap_count = 0;
-        struct buffer_head *bitmap_bh = NULL;
-        int i;
-        for (i = 0; i < EXT2_SB(sb)->s_groups_count; i++) {
-                struct ext2_group_desc *desc;
-                unsigned x;
-                desc = ext2_get_group_desc(sb, i, NULL);
-                if (!desc)
-                        continue;
-                desc_count += le16_to_cpu(desc->bg_free_inodes_count);
-                brelse(bitmap_bh);
-                bitmap_bh = read_inode_bitmap(sb, i);
-                if (!bitmap_bh)
-                        continue;
-                
-                x = ext2_count_free(bitmap_bh, EXT2_INODES_PER_GROUP(sb) / 8);
-                if (le16_to_cpu(desc->bg_free_inodes_count) != x)
-                        ext2_error (sb, "ext2_check_inodes_bitmap",
-                                    "Wrong free inodes count in group %d, "
-                                    "stored = %d, counted = %lu", i,
-                                    le16_to_cpu(desc->bg_free_inodes_count), x);
-                bitmap_count += x;
-        }
-        brelse(bitmap_bh);
-        if (percpu_counter_read(&EXT2_SB(sb)->s_freeinodes_counter) !=
-                                bitmap_count)
-                ext2_error(sb, "ext2_check_inodes_bitmap",
-                            "Wrong free inodes count in super block, "
-                            "stored = %lu, counted = %lu",
-                            (unsigned long)le32_to_cpu(es->s_free_inodes_count),
-                            bitmap_count);
-}
-#endif
diff --git a/fs/ext2/super.c b/fs/ext2/super.c
index 3c0c7c6a5b44..e4ed4b31a433 100644
--- a/fs/ext2/super.c
+++ b/fs/ext2/super.c
@@ -281,7 +281,7 @@ static unsigned long get_sb_block(void **data)
 enum {
        Opt_bsd_df, Opt_minix_df, Opt_grpid, Opt_nogrpid,
        Opt_resgid, Opt_resuid, Opt_sb, Opt_err_cont, Opt_err_panic,
-        Opt_err_ro, Opt_nouid32, Opt_check, Opt_nocheck, Opt_debug,
+        Opt_err_ro, Opt_nouid32, Opt_nocheck, Opt_debug,
        Opt_oldalloc, Opt_orlov, Opt_nobh, Opt_user_xattr, Opt_nouser_xattr,
        Opt_acl, Opt_noacl, Opt_xip, Opt_ignore, Opt_err, Opt_quota,
        Opt_usrquota, Opt_grpquota
@@ -303,7 +303,6 @@ static match_table_t tokens = {
        {Opt_nouid32, "nouid32"},
        {Opt_nocheck, "check=none"},
        {Opt_nocheck, "nocheck"},
-        {Opt_check, "check"},
        {Opt_debug, "debug"},
        {Opt_oldalloc, "oldalloc"},
        {Opt_orlov, "orlov"},
@@ -376,13 +375,6 @@ static int parse_options (char * options,
                case Opt_nouid32:
                        set_opt (sbi->s_mount_opt, NO_UID32);
                        break;
-                case Opt_check:
-#ifdef CONFIG_EXT2_CHECK
-                        set_opt (sbi->s_mount_opt, CHECK);
-#else
-                        printk("EXT2 Check option not supported\n");
-#endif
-                        break;
                case Opt_nocheck:
                        clear_opt (sbi->s_mount_opt, CHECK);
                        break;
@@ -503,12 +495,6 @@ static int ext2_setup_super (struct super_block * sb,
                        EXT2_BLOCKS_PER_GROUP(sb),
                        EXT2_INODES_PER_GROUP(sb),
                        sbi->s_mount_opt);
-#ifdef CONFIG_EXT2_CHECK
-        if (test_opt (sb, CHECK)) {
-                ext2_check_blocks_bitmap (sb);
-                ext2_check_inodes_bitmap (sb);
-        }
-#endif
        return res;
 }
diff --git a/fs/ext3/balloc.c b/fs/ext3/balloc.c
index 7992d21e0e09..ae1148c24c53 100644
--- a/fs/ext3/balloc.c
+++ b/fs/ext3/balloc.c
@@ -1517,76 +1517,3 @@ unsigned long ext3_bg_num_gdb(struct super_block *sb, int group)
        return EXT3_SB(sb)->s_gdb_count;
 }
-#ifdef CONFIG_EXT3_CHECK
-/* Called at mount-time, super-block is locked */
-void ext3_check_blocks_bitmap (struct super_block * sb)
-{
-        struct ext3_super_block *es;
-        unsigned long desc_count, bitmap_count, x, j;
-        unsigned long desc_blocks;
-        struct buffer_head *bitmap_bh = NULL;
-        struct ext3_group_desc *gdp;
-        int i;
-        es = EXT3_SB(sb)->s_es;
-        desc_count = 0;
-        bitmap_count = 0;
-        gdp = NULL;
-        for (i = 0; i < EXT3_SB(sb)->s_groups_count; i++) {
-                gdp = ext3_get_group_desc (sb, i, NULL);
-                if (!gdp)
-                        continue;
-                desc_count += le16_to_cpu(gdp->bg_free_blocks_count);
-                brelse(bitmap_bh);
-                bitmap_bh = read_block_bitmap(sb, i);
-                if (bitmap_bh == NULL)
-                        continue;
-                if (ext3_bg_has_super(sb, i) &&
-                                !ext3_test_bit(0, bitmap_bh->b_data))
-                        ext3_error(sb, __FUNCTION__,
-                                   "Superblock in group %d is marked free", i);
-                desc_blocks = ext3_bg_num_gdb(sb, i);
-                for (j = 0; j < desc_blocks; j++)
-                        if (!ext3_test_bit(j + 1, bitmap_bh->b_data))
-                                ext3_error(sb, __FUNCTION__,
-                                           "Descriptor block #%ld in group "
-                                           "%d is marked free", j, i);
-                if (!block_in_use (le32_to_cpu(gdp->bg_block_bitmap),
-                                                sb, bitmap_bh->b_data))
-                        ext3_error (sb, "ext3_check_blocks_bitmap",
-                                    "Block bitmap for group %d is marked free",
-                                    i);
-                if (!block_in_use (le32_to_cpu(gdp->bg_inode_bitmap),
-                                                sb, bitmap_bh->b_data))
-                        ext3_error (sb, "ext3_check_blocks_bitmap",
-                                    "Inode bitmap for group %d is marked free",
-                                    i);
-                for (j = 0; j < EXT3_SB(sb)->s_itb_per_group; j++)
-                        if (!block_in_use (le32_to_cpu(gdp->bg_inode_table) + j,
-                                                        sb, bitmap_bh->b_data))
-                                ext3_error (sb, "ext3_check_blocks_bitmap",
-                                            "Block #%d of the inode table in "
-                                            "group %d is marked free", j, i);
-                x = ext3_count_free(bitmap_bh, sb->s_blocksize);
-                if (le16_to_cpu(gdp->bg_free_blocks_count) != x)
-                        ext3_error (sb, "ext3_check_blocks_bitmap",
-                                    "Wrong free blocks count for group %d, "
-                                    "stored = %d, counted = %lu", i,
-                                    le16_to_cpu(gdp->bg_free_blocks_count), x);
-                bitmap_count += x;
-        }
-        brelse(bitmap_bh);
-        if (le32_to_cpu(es->s_free_blocks_count) != bitmap_count)
-                ext3_error (sb, "ext3_check_blocks_bitmap",
-                        "Wrong free blocks count in super block, "
-                        "stored = %lu, counted = %lu",
-                        (unsigned long)le32_to_cpu(es->s_free_blocks_count),
-                        bitmap_count);
-}
-#endif
diff --git a/fs/ext3/ialloc.c b/fs/ext3/ialloc.c
index df3f517c54ac..9e4a24376210 100644
--- a/fs/ext3/ialloc.c
+++ b/fs/ext3/ialloc.c
@@ -756,44 +756,3 @@ unsigned long ext3_count_dirs (struct super_block * sb)
        return count;
 }
-#ifdef CONFIG_EXT3_CHECK
-/* Called at mount-time, super-block is locked */
-void ext3_check_inodes_bitmap (struct super_block * sb)
-{
-        struct ext3_super_block * es;
-        unsigned long desc_count, bitmap_count, x;
-        struct buffer_head *bitmap_bh = NULL;
-        struct ext3_group_desc * gdp;
-        int i;
-        es = EXT3_SB(sb)->s_es;
-        desc_count = 0;
-        bitmap_count = 0;
-        gdp = NULL;
-        for (i = 0; i < EXT3_SB(sb)->s_groups_count; i++) {
-                gdp = ext3_get_group_desc (sb, i, NULL);
-                if (!gdp)
-                        continue;
-                desc_count += le16_to_cpu(gdp->bg_free_inodes_count);
-                brelse(bitmap_bh);
-                bitmap_bh = read_inode_bitmap(sb, i);
-                if (!bitmap_bh)
-                        continue;
-                x = ext3_count_free(bitmap_bh, EXT3_INODES_PER_GROUP(sb) / 8);
-                if (le16_to_cpu(gdp->bg_free_inodes_count) != x)
-                        ext3_error (sb, "ext3_check_inodes_bitmap",
-                                    "Wrong free inodes count in group %d, "
-                                    "stored = %d, counted = %lu", i,
-                                    le16_to_cpu(gdp->bg_free_inodes_count), x);
-                bitmap_count += x;
-        }
-        brelse(bitmap_bh);
-        if (le32_to_cpu(es->s_free_inodes_count) != bitmap_count)
-                ext3_error (sb, "ext3_check_inodes_bitmap",
-                            "Wrong free inodes count in super block, "
-                            "stored = %lu, counted = %lu",
-                            (unsigned long)le32_to_cpu(es->s_free_inodes_count),
-                            bitmap_count);
-}
-#endif
diff --git a/fs/ext3/super.c b/fs/ext3/super.c
index f594989ccb7a..4e6730622d90 100644
--- a/fs/ext3/super.c
+++ b/fs/ext3/super.c
@@ -625,7 +625,7 @@ static struct export_operations ext3_export_ops = {
 enum {
        Opt_bsd_df, Opt_minix_df, Opt_grpid, Opt_nogrpid,
        Opt_resgid, Opt_resuid, Opt_sb, Opt_err_cont, Opt_err_panic, Opt_err_ro,
-        Opt_nouid32, Opt_check, Opt_nocheck, Opt_debug, Opt_oldalloc, Opt_orlov,
+        Opt_nouid32, Opt_nocheck, Opt_debug, Opt_oldalloc, Opt_orlov,
        Opt_user_xattr, Opt_nouser_xattr, Opt_acl, Opt_noacl,
        Opt_reservation, Opt_noreservation, Opt_noload, Opt_nobh,
        Opt_commit, Opt_journal_update, Opt_journal_inum,
@@ -652,7 +652,6 @@ static match_table_t tokens = {
        {Opt_nouid32, "nouid32"},
        {Opt_nocheck, "nocheck"},
        {Opt_nocheck, "check=none"},
-        {Opt_check, "check"},
        {Opt_debug, "debug"},
        {Opt_oldalloc, "oldalloc"},
        {Opt_orlov, "orlov"},
@@ -773,14 +772,6 @@ static int parse_options (char * options, struct super_block *sb,
                case Opt_nouid32:
                        set_opt (sbi->s_mount_opt, NO_UID32);
                        break;
-                case Opt_check:
-#ifdef CONFIG_EXT3_CHECK
-                        set_opt (sbi->s_mount_opt, CHECK);
-#else
-                        printk(KERN_ERR
-                               "EXT3 Check option not supported\n");
-#endif
-                        break;
                case Opt_nocheck:
                        clear_opt (sbi->s_mount_opt, CHECK);
                        break;
@@ -1115,12 +1106,6 @@ static int ext3_setup_super(struct super_block *sb, struct ext3_super_block *es,
        } else {
                printk("internal journal\n");
        }
-#ifdef CONFIG_EXT3_CHECK
-        if (test_opt (sb, CHECK)) {
-                ext3_check_blocks_bitmap (sb);
-                ext3_check_inodes_bitmap (sb);
-        }
-#endif
        return res;
 }
diff --git a/fs/fat/inode.c b/fs/fat/inode.c
index e2effe2dc9b2..a0f9b9fe1307 100644
--- a/fs/fat/inode.c
+++ b/fs/fat/inode.c
@@ -846,7 +846,7 @@ static match_table_t vfat_tokens = {
        {Opt_err, NULL}
 };
-static int parse_options(char *options, int is_vfat, int *debug,
+static int parse_options(char *options, int is_vfat, int silent, int *debug,
                         struct fat_mount_options *opts)
 {
        char *p;
@@ -1008,8 +1008,11 @@ static int parse_options(char *options, int is_vfat, int *debug,
                        break;
                /* unknown option */
                default:
-                        printk(KERN_ERR "FAT: Unrecognized mount option \"%s\" "
+                        if (!silent) {
-                               "or missing value\n", p);
+                                printk(KERN_ERR
+                                       "FAT: Unrecognized mount option \"%s\" "
+                                       "or missing value\n", p);
+                        }
                        return -EINVAL;
                }
        }
@@ -1091,7 +1094,7 @@ int fat_fill_super(struct super_block *sb, void *data, int silent,
        sb->s_export_op = &fat_export_ops;
        sbi->dir_ops = fs_dir_inode_ops;
-        error = parse_options(data, isvfat, &debug, &sbi->options);
+        error = parse_options(data, isvfat, silent, &debug, &sbi->options);
        if (error)
                goto out_fail;
diff --git a/fs/hfs/hfs_fs.h b/fs/hfs/hfs_fs.h
index aae019aadf88..cc5dcd52e23d 100644
--- a/fs/hfs/hfs_fs.h
+++ b/fs/hfs/hfs_fs.h
@@ -9,7 +9,6 @@
 #ifndef _LINUX_HFS_FS_H
 #define _LINUX_HFS_FS_H
-#include <linux/version.h>
 #include <linux/slab.h>
 #include <linux/types.h>
 #include <linux/buffer_head.h>
diff --git a/fs/hfs/inode.c b/fs/hfs/inode.c
index 3f680c5675bf..d499393a8ae7 100644
--- a/fs/hfs/inode.c
+++ b/fs/hfs/inode.c
@@ -12,7 +12,6 @@
 */
 #include <linux/pagemap.h>
-#include <linux/version.h>
 #include <linux/mpage.h>
 #include "hfs_fs.h"
diff --git a/fs/hfsplus/bnode.c b/fs/hfsplus/bnode.c
index b85abc6e6f83..930cd9212de8 100644
--- a/fs/hfsplus/bnode.c
+++ b/fs/hfsplus/bnode.c
@@ -13,7 +13,6 @@
 #include <linux/pagemap.h>
 #include <linux/fs.h>
 #include <linux/swap.h>
-#include <linux/version.h>
 #include "hfsplus_fs.h"
 #include "hfsplus_raw.h"
diff --git a/fs/hfsplus/dir.c b/fs/hfsplus/dir.c
index 7bda76667a4a..50c8f44b6c66 100644
--- a/fs/hfsplus/dir.c
+++ b/fs/hfsplus/dir.c
@@ -13,7 +13,6 @@
 #include <linux/sched.h>
 #include <linux/slab.h>
 #include <linux/random.h>
-#include <linux/version.h>
 #include "hfsplus_fs.h"
 #include "hfsplus_raw.h"
diff --git a/fs/hfsplus/extents.c b/fs/hfsplus/extents.c
index e7235ca79a95..e3ff56a03011 100644
--- a/fs/hfsplus/extents.c
+++ b/fs/hfsplus/extents.c
@@ -11,7 +11,6 @@
 #include <linux/errno.h>
 #include <linux/fs.h>
 #include <linux/pagemap.h>
-#include <linux/version.h>
 #include "hfsplus_fs.h"
 #include "hfsplus_raw.h"
diff --git a/fs/hfsplus/hfsplus_fs.h b/fs/hfsplus/hfsplus_fs.h
index 2bc0cdd30e56..c60e5635498d 100644
--- a/fs/hfsplus/hfsplus_fs.h
+++ b/fs/hfsplus/hfsplus_fs.h
@@ -11,7 +11,6 @@
 #define _LINUX_HFSPLUS_FS_H
 #include <linux/fs.h>
-#include <linux/version.h>
 #include <linux/buffer_head.h>
 #include "hfsplus_raw.h"
diff --git a/fs/hfsplus/inode.c b/fs/hfsplus/inode.c
index f205773ddfbe..fc98583cf045 100644
--- a/fs/hfsplus/inode.c
+++ b/fs/hfsplus/inode.c
@@ -11,7 +11,6 @@
 #include <linux/mm.h>
 #include <linux/fs.h>
 #include <linux/pagemap.h>
-#include <linux/version.h>
 #include <linux/mpage.h>
 #include "hfsplus_fs.h"
diff --git a/fs/hfsplus/super.c b/fs/hfsplus/super.c
index 452fc1fdbd32..0ce1c455ae55 100644
--- a/fs/hfsplus/super.c
+++ b/fs/hfsplus/super.c
@@ -14,7 +14,6 @@
 #include <linux/fs.h>
 #include <linux/sched.h>
 #include <linux/slab.h>
-#include <linux/version.h>
 #include <linux/vfs.h>
 #include <linux/nls.h>
diff --git a/fs/hfsplus/wrapper.c b/fs/hfsplus/wrapper.c
index 0c51d6338b0b..95455e839231 100644
--- a/fs/hfsplus/wrapper.c
+++ b/fs/hfsplus/wrapper.c
@@ -12,7 +12,6 @@
 #include <linux/blkdev.h>
 #include <linux/cdrom.h>
 #include <linux/genhd.h>
-#include <linux/version.h>
 #include <asm/unaligned.h>
 #include "hfsplus_fs.h"
diff --git a/fs/hostfs/hostfs_kern.c b/fs/hostfs/hostfs_kern.c
index a33fb1d91373..4684eb7d48c6 100644
--- a/fs/hostfs/hostfs_kern.c
+++ b/fs/hostfs/hostfs_kern.c
@@ -8,7 +8,6 @@
 #include <linux/stddef.h>
 #include <linux/fs.h>
-#include <linux/version.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>
diff --git a/fs/hpfs/file.c b/fs/hpfs/file.c
index ab144dabd870..7c995ac4081b 100644
--- a/fs/hpfs/file.c
+++ b/fs/hpfs/file.c
@@ -114,11 +114,8 @@ static ssize_t hpfs_file_write(struct file *file, const char __user *buf,
        ssize_t retval;
        retval = generic_file_write(file, buf, count, ppos);
-        if (retval > 0) {
+        if (retval > 0)
-                struct inode *inode = file->f_dentry->d_inode;
+                hpfs_i(file->f_dentry->d_inode)->i_dirty = 1;
-                inode->i_mtime = CURRENT_TIME_SEC;
-                hpfs_i(inode)->i_dirty = 1;
-        }
        return retval;
 }
diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
index e026c807e6b3..64983ab55586 100644
--- a/fs/hugetlbfs/inode.c
+++ b/fs/hugetlbfs/inode.c
@@ -63,7 +63,7 @@ static void huge_pagevec_release(struct pagevec *pvec)
 *
 * Result is in bytes to be compatible with is_hugepage_mem_enough()
 */
-unsigned long
+static unsigned long
 huge_pages_needed(struct address_space *mapping, struct vm_area_struct *vma)
 {
        int i;
diff --git a/fs/inotify.c b/fs/inotify.c
index 9fbaebfdf40b..bf7ce1d2412b 100644
--- a/fs/inotify.c
+++ b/fs/inotify.c
@@ -372,7 +372,7 @@ static int find_inode(const char __user *dirname, struct nameidata *nd)
        if (error)
                return error;
        /* you can only watch an inode if you have read permissions on it */
-        error = permission(nd->dentry->d_inode, MAY_READ, NULL);
+        error = vfs_permission(nd, MAY_READ);
        if (error) 
                path_release(nd);
        return error;
diff --git a/fs/jfs/namei.c b/fs/jfs/namei.c
index 1abe7343f920..4abbe8604302 100644
--- a/fs/jfs/namei.c
+++ b/fs/jfs/namei.c
@@ -827,6 +827,7 @@ static int jfs_link(struct dentry *old_dentry,
        /* update object inode */
        ip->i_nlink++;          /* for new link */
        ip->i_ctime = CURRENT_TIME;
+        dir->i_ctime = dir->i_mtime = CURRENT_TIME;
        mark_inode_dirty(dir);
        atomic_inc(&ip->i_count);
@@ -1024,6 +1025,8 @@ static int jfs_symlink(struct inode *dip, struct dentry *dentry,
        insert_inode_hash(ip);
        mark_inode_dirty(ip);
+        dip->i_ctime = dip->i_mtime = CURRENT_TIME;
+        mark_inode_dirty(dip);
        /*
         * commit update of parent directory and link object
         */
diff --git a/fs/namei.c b/fs/namei.c
index b3f8a1966c9c..6dbbd42d8b95 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -256,6 +256,38 @@ int permission(struct inode *inode, int mask, struct nameidata *nd)
        return security_inode_permission(inode, mask, nd);
 }
+/**
+ * vfs_permission  -  check for access rights to a given path
+ * @nd:         lookup result that describes the path
+ * @mask:       right to check for (%MAY_READ, %MAY_WRITE, %MAY_EXEC)
+ *
+ * Used to check for read/write/execute permissions on a path.
+ * We use "fsuid" for this, letting us set arbitrary permissions
+ * for filesystem access without changing the "normal" uids which
+ * are used for other things.
+ */
+int vfs_permission(struct nameidata *nd, int mask)
+{
+        return permission(nd->dentry->d_inode, mask, nd);
+}
+/**
+ * file_permission  -  check for additional access rights to a given file
+ * @file:       file to check access rights for
+ * @mask:       right to check for (%MAY_READ, %MAY_WRITE, %MAY_EXEC)
+ *
+ * Used to check for read/write/execute permissions on an already opened
+ * file.
+ *
+ * Note:
+ *      Do not use this function in new code.  All access checks should
+ *      be done using vfs_permission().
+ */
+int file_permission(struct file *file, int mask)
+{
+        return permission(file->f_dentry->d_inode, mask, NULL);
+}
 /*
 * get_write_access() gets write permission for a file.
 * put_write_access() releases this write permission.
@@ -765,9 +797,8 @@ static fastcall int __link_path_walk(const char * name, struct nameidata *nd)
                nd->flags |= LOOKUP_CONTINUE;
                err = exec_permission_lite(inode, nd);
-                if (err == -EAGAIN) { 
+                if (err == -EAGAIN)
-                        err = permission(inode, MAY_EXEC, nd);
+                        err = vfs_permission(nd, MAY_EXEC);
-                }
                if (err)
                        break;
@@ -1109,8 +1140,9 @@ int path_lookup_open(const char *name, unsigned int lookup_flags,
 * @open_flags: open intent flags
 * @create_mode: create intent flags
 */
-int path_lookup_create(const char *name, unsigned int lookup_flags,
+static int path_lookup_create(const char *name, unsigned int lookup_flags,
-                struct nameidata *nd, int open_flags, int create_mode)
+                              struct nameidata *nd, int open_flags,
+                              int create_mode)
 {
        return __path_lookup_intent_open(name, lookup_flags|LOOKUP_CREATE, nd,
                        open_flags, create_mode);
@@ -1173,9 +1205,9 @@ out:
        return dentry;
 }
-struct dentry * lookup_hash(struct qstr *name, struct dentry * base)
+struct dentry * lookup_hash(struct nameidata *nd)
 {
-        return __lookup_hash(name, base, NULL);
+        return __lookup_hash(&nd->last, nd->dentry, nd);
 }
 /* SMP-safe */
@@ -1199,7 +1231,7 @@ struct dentry * lookup_one_len(const char * name, struct dentry * base, int len)
        }
        this.hash = end_name_hash(hash);
-        return lookup_hash(&this, base);
+        return __lookup_hash(&this, base, NULL);
 access:
        return ERR_PTR(-EACCES);
 }
@@ -1407,7 +1439,7 @@ int may_open(struct nameidata *nd, int acc_mode, int flag)
        if (S_ISDIR(inode->i_mode) && (flag & FMODE_WRITE))
                return -EISDIR;
-        error = permission(inode, acc_mode, nd);
+        error = vfs_permission(nd, acc_mode);
        if (error)
                return error;
@@ -1532,7 +1564,7 @@ int open_namei(const char * pathname, int flag, int mode, struct nameidata *nd)
        dir = nd->dentry;
        nd->flags &= ~LOOKUP_PARENT;
        down(&dir->d_inode->i_sem);
-        path.dentry = __lookup_hash(&nd->last, nd->dentry, nd);
+        path.dentry = lookup_hash(nd);
        path.mnt = nd->mnt;
 do_last:
@@ -1634,7 +1666,7 @@ do_link:
        }
        dir = nd->dentry;
        down(&dir->d_inode->i_sem);
-        path.dentry = __lookup_hash(&nd->last, nd->dentry, nd);
+        path.dentry = lookup_hash(nd);
        path.mnt = nd->mnt;
        __putname(nd->last.name);
        goto do_last;
@@ -1666,7 +1698,7 @@ struct dentry *lookup_create(struct nameidata *nd, int is_dir)
        /*
         * Do the final lookup.
         */
-        dentry = lookup_hash(&nd->last, nd->dentry);
+        dentry = lookup_hash(nd);
        if (IS_ERR(dentry))
                goto fail;
@@ -1901,7 +1933,7 @@ asmlinkage long sys_rmdir(const char __user * pathname)
                        goto exit1;
        }
        down(&nd.dentry->d_inode->i_sem);
-        dentry = lookup_hash(&nd.last, nd.dentry);
+        dentry = lookup_hash(&nd);
        error = PTR_ERR(dentry);
        if (!IS_ERR(dentry)) {
                error = vfs_rmdir(nd.dentry->d_inode, dentry);
@@ -1970,7 +2002,7 @@ asmlinkage long sys_unlink(const char __user * pathname)
        if (nd.last_type != LAST_NORM)
                goto exit1;
        down(&nd.dentry->d_inode->i_sem);
-        dentry = lookup_hash(&nd.last, nd.dentry);
+        dentry = lookup_hash(&nd);
        error = PTR_ERR(dentry);
        if (!IS_ERR(dentry)) {
                /* Why not before? Because we want correct error value */
@@ -2313,7 +2345,7 @@ static inline int do_rename(const char * oldname, const char * newname)
        trap = lock_rename(new_dir, old_dir);
-        old_dentry = lookup_hash(&oldnd.last, old_dir);
+        old_dentry = lookup_hash(&oldnd);
        error = PTR_ERR(old_dentry);
        if (IS_ERR(old_dentry))
                goto exit3;
@@ -2333,7 +2365,7 @@ static inline int do_rename(const char * oldname, const char * newname)
        error = -EINVAL;
        if (old_dentry == trap)
                goto exit4;
-        new_dentry = lookup_hash(&newnd.last, new_dir);
+        new_dentry = lookup_hash(&newnd);
        error = PTR_ERR(new_dentry);
        if (IS_ERR(new_dentry))
                goto exit4;
@@ -2536,6 +2568,8 @@ EXPORT_SYMBOL(path_lookup);
 EXPORT_SYMBOL(path_release);
 EXPORT_SYMBOL(path_walk);
 EXPORT_SYMBOL(permission);
+EXPORT_SYMBOL(vfs_permission);
+EXPORT_SYMBOL(file_permission);
 EXPORT_SYMBOL(unlock_rename);
 EXPORT_SYMBOL(vfs_create);
 EXPORT_SYMBOL(vfs_follow_link);
diff --git a/fs/namespace.c b/fs/namespace.c
index caa9187f67e5..2019899f2ab8 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -637,7 +637,7 @@ static int mount_is_safe(struct nameidata *nd)
                if (current->uid != nd->dentry->d_inode->i_uid)
                        return -EPERM;
        }
-        if (permission(nd->dentry->d_inode, MAY_WRITE, nd))
+        if (vfs_permission(nd, MAY_WRITE))
                return -EPERM;
        return 0;
 #endif
diff --git a/fs/ncpfs/ioctl.c b/fs/ncpfs/ioctl.c
index 88df79356a1f..fd3efdca5ae3 100644
--- a/fs/ncpfs/ioctl.c
+++ b/fs/ncpfs/ioctl.c
@@ -30,11 +30,13 @@
 #define NCP_PACKET_SIZE_INTERNAL 65536
 static int
-ncp_get_fs_info(struct ncp_server* server, struct inode* inode, struct ncp_fs_info __user *arg)
+ncp_get_fs_info(struct ncp_server * server, struct file *file,
+                struct ncp_fs_info __user *arg)
 {
+        struct inode *inode = file->f_dentry->d_inode;
        struct ncp_fs_info info;
-        if ((permission(inode, MAY_WRITE, NULL) != 0)
+        if ((file_permission(file, MAY_WRITE) != 0)
            && (current->uid != server->m.mounted_uid)) {
                return -EACCES;
        }
@@ -58,11 +60,13 @@ ncp_get_fs_info(struct ncp_server* server, struct inode* inode, struct ncp_fs_in
 }
 static int
-ncp_get_fs_info_v2(struct ncp_server* server, struct inode* inode, struct ncp_fs_info_v2 __user * arg)
+ncp_get_fs_info_v2(struct ncp_server * server, struct file *file,
+                   struct ncp_fs_info_v2 __user * arg)
 {
+        struct inode *inode = file->f_dentry->d_inode;
        struct ncp_fs_info_v2 info2;
-        if ((permission(inode, MAY_WRITE, NULL) != 0)
+        if ((file_permission(file, MAY_WRITE) != 0)
            && (current->uid != server->m.mounted_uid)) {
                return -EACCES;
        }
@@ -190,7 +194,7 @@ int ncp_ioctl(struct inode *inode, struct file *filp,
        switch (cmd) {
        case NCP_IOC_NCPREQUEST:
-                if ((permission(inode, MAY_WRITE, NULL) != 0)
+                if ((file_permission(filp, MAY_WRITE) != 0)
                    && (current->uid != server->m.mounted_uid)) {
                        return -EACCES;
                }
@@ -245,16 +249,16 @@ int ncp_ioctl(struct inode *inode, struct file *filp,
                return ncp_conn_logged_in(inode->i_sb);
        case NCP_IOC_GET_FS_INFO:
-                return ncp_get_fs_info(server, inode, argp);
+                return ncp_get_fs_info(server, filp, argp);
        case NCP_IOC_GET_FS_INFO_V2:
-                return ncp_get_fs_info_v2(server, inode, argp);
+                return ncp_get_fs_info_v2(server, filp, argp);
        case NCP_IOC_GETMOUNTUID2:
                {
                        unsigned long tmp = server->m.mounted_uid;
-                        if (   (permission(inode, MAY_READ, NULL) != 0)
+                        if ((file_permission(filp, MAY_READ) != 0)
                            && (current->uid != server->m.mounted_uid))
                        {
                                return -EACCES;
@@ -268,7 +272,7 @@ int ncp_ioctl(struct inode *inode, struct file *filp,
                {
                        struct ncp_setroot_ioctl sr;
-                        if (   (permission(inode, MAY_READ, NULL) != 0)
+                        if ((file_permission(filp, MAY_READ) != 0)
                            && (current->uid != server->m.mounted_uid))
                        {
                                return -EACCES;
@@ -343,7 +347,7 @@ int ncp_ioctl(struct inode *inode, struct file *filp,
 #ifdef CONFIG_NCPFS_PACKET_SIGNING      
        case NCP_IOC_SIGN_INIT:
-                if ((permission(inode, MAY_WRITE, NULL) != 0)
+                if ((file_permission(filp, MAY_WRITE) != 0)
                    && (current->uid != server->m.mounted_uid))
                {
                        return -EACCES;
@@ -366,7 +370,7 @@ int ncp_ioctl(struct inode *inode, struct file *filp,
                return 0;               
                
        case NCP_IOC_SIGN_WANTED:
-                if (   (permission(inode, MAY_READ, NULL) != 0)
+                if ((file_permission(filp, MAY_READ) != 0)
                    && (current->uid != server->m.mounted_uid))
                {
                        return -EACCES;
@@ -379,7 +383,7 @@ int ncp_ioctl(struct inode *inode, struct file *filp,
                {
                        int newstate;
-                        if (   (permission(inode, MAY_WRITE, NULL) != 0)
+                        if ((file_permission(filp, MAY_WRITE) != 0)
                            && (current->uid != server->m.mounted_uid))
                        {
                                return -EACCES;
@@ -400,7 +404,7 @@ int ncp_ioctl(struct inode *inode, struct file *filp,
 #ifdef CONFIG_NCPFS_IOCTL_LOCKING
        case NCP_IOC_LOCKUNLOCK:
-                if (   (permission(inode, MAY_WRITE, NULL) != 0)
+                if ((file_permission(filp, MAY_WRITE) != 0)
                    && (current->uid != server->m.mounted_uid))
                {
                        return -EACCES;
@@ -605,7 +609,7 @@ outrel:
 #endif /* CONFIG_NCPFS_NLS */
        case NCP_IOC_SETDENTRYTTL:
-                if ((permission(inode, MAY_WRITE, NULL) != 0) &&
+                if ((file_permission(filp, MAY_WRITE) != 0) &&
                                 (current->uid != server->m.mounted_uid))
                        return -EACCES;
                {
@@ -635,7 +639,7 @@ outrel:
           so we have this out of switch */
        if (cmd == NCP_IOC_GETMOUNTUID) {
                __kernel_uid_t uid = 0;
-                if ((permission(inode, MAY_READ, NULL) != 0)
+                if ((file_permission(filp, MAY_READ) != 0)
                    && (current->uid != server->m.mounted_uid)) {
                        return -EACCES;
                }
diff --git a/fs/open.c b/fs/open.c
index 6e8136751e9a..f53a5b9ffb7d 100644
--- a/fs/open.c
+++ b/fs/open.c
@@ -240,7 +240,7 @@ static inline long do_sys_truncate(const char __user * path, loff_t length)
        if (!S_ISREG(inode->i_mode))
                goto dput_and_out;
-        error = permission(inode,MAY_WRITE,&nd);
+        error = vfs_permission(&nd, MAY_WRITE);
        if (error)
                goto dput_and_out;
@@ -394,7 +394,7 @@ asmlinkage long sys_utime(char __user * filename, struct utimbuf __user * times)
                        goto dput_and_out;
                if (current->fsuid != inode->i_uid &&
-                    (error = permission(inode,MAY_WRITE,&nd)) != 0)
+                    (error = vfs_permission(&nd, MAY_WRITE)) != 0)
                        goto dput_and_out;
        }
        down(&inode->i_sem);
@@ -447,7 +447,7 @@ long do_utimes(char __user * filename, struct timeval * times)
                        goto dput_and_out;
                if (current->fsuid != inode->i_uid &&
-                    (error = permission(inode,MAY_WRITE,&nd)) != 0)
+                    (error = vfs_permission(&nd, MAY_WRITE)) != 0)
                        goto dput_and_out;
        }
        down(&inode->i_sem);
@@ -506,7 +506,7 @@ asmlinkage long sys_access(const char __user * filename, int mode)
        res = __user_walk(filename, LOOKUP_FOLLOW|LOOKUP_ACCESS, &nd);
        if (!res) {
-                res = permission(nd.dentry->d_inode, mode, &nd);
+                res = vfs_permission(&nd, mode);
                /* SuS v2 requires we report a read only fs too */
                if(!res && (mode & S_IWOTH) && IS_RDONLY(nd.dentry->d_inode)
                   && !special_file(nd.dentry->d_inode->i_mode))
@@ -530,7 +530,7 @@ asmlinkage long sys_chdir(const char __user * filename)
        if (error)
                goto out;
-        error = permission(nd.dentry->d_inode,MAY_EXEC,&nd);
+        error = vfs_permission(&nd, MAY_EXEC);
        if (error)
                goto dput_and_out;
@@ -563,7 +563,7 @@ asmlinkage long sys_fchdir(unsigned int fd)
        if (!S_ISDIR(inode->i_mode))
                goto out_putf;
-        error = permission(inode, MAY_EXEC, NULL);
+        error = file_permission(file, MAY_EXEC);
        if (!error)
                set_fs_pwd(current->fs, mnt, dentry);
 out_putf:
@@ -581,7 +581,7 @@ asmlinkage long sys_chroot(const char __user * filename)
        if (error)
                goto out;
-        error = permission(nd.dentry->d_inode,MAY_EXEC,&nd);
+        error = vfs_permission(&nd, MAY_EXEC);
        if (error)
                goto dput_and_out;
diff --git a/fs/reiserfs/file.c b/fs/reiserfs/file.c
index c20babd6216d..7892a865b58a 100644
--- a/fs/reiserfs/file.c
+++ b/fs/reiserfs/file.c
@@ -251,12 +251,12 @@ static int reiserfs_allocate_blocks_for_region(struct reiserfs_transaction_handl
                                                       blocks_to_allocate,
                                                       blocks_to_allocate);
                        if (res != CARRY_ON) {
-                                res = -ENOSPC;
+                                res = res == QUOTA_EXCEEDED ? -EDQUOT : -ENOSPC;
                                pathrelse(&path);
                                goto error_exit;
                        }
                } else {
-                        res = -ENOSPC;
+                        res = res == QUOTA_EXCEEDED ? -EDQUOT : -ENOSPC;
                        pathrelse(&path);
                        goto error_exit;
                }
diff --git a/fs/udf/file.c b/fs/udf/file.c
index bb40d63f328f..01f520c71dc1 100644
--- a/fs/udf/file.c
+++ b/fs/udf/file.c
@@ -186,7 +186,7 @@ int udf_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
 {
        int result = -EINVAL;
-        if ( permission(inode, MAY_READ, NULL) != 0 )
+        if ( file_permission(filp, MAY_READ) != 0 )
        {
                udf_debug("no permission to access inode %lu\n",
                                                inode->i_ino);
diff --git a/fs/xfs/linux-2.6/xfs_linux.h b/fs/xfs/linux-2.6/xfs_linux.h
index 44fed10af0dd..d8e21ba0cccc 100644
--- a/fs/xfs/linux-2.6/xfs_linux.h
+++ b/fs/xfs/linux-2.6/xfs_linux.h
@@ -72,7 +72,6 @@
 #include <linux/init.h>
 #include <linux/list.h>
 #include <linux/proc_fs.h>
-#include <linux/version.h>
 #include <linux/sort.h>
 #include <asm/page.h>
diff --git a/fs/xfs/xfs.h b/fs/xfs/xfs.h
index 99b50d2bda9b..1a48dbb902a7 100644
--- a/fs/xfs/xfs.h
+++ b/fs/xfs/xfs.h
@@ -17,12 +17,5 @@
 */
 #ifndef __XFS_H__
 #define __XFS_H__
-#include <linux/version.h>
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
 #include <linux-2.6/xfs_linux.h>
-#else
-#include <linux-2.4/xfs_linux.h>
-#endif
 #endif  /* __XFS_H__ */
diff --git a/fs/xfs/xfs_dmapi.h b/fs/xfs/xfs_dmapi.h
index 5a5c7a63e80b..864bf6955689 100644
--- a/fs/xfs/xfs_dmapi.h
+++ b/fs/xfs/xfs_dmapi.h
@@ -18,6 +18,7 @@
 #ifndef __XFS_DMAPI_H__
 #define __XFS_DMAPI_H__
+#include <linux/version.h>
 /*      Values used to define the on-disk version of dm_attrname_t. All
 *      on-disk attribute names start with the 8-byte string "SGI_DMI_".
 *