Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 0 insertions, 2 deletions

diff --git a/fs/namespace.c b/fs/namespace.c
index f48f98110c30..fe376805cf5f 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -14,7 +14,6 @@
 #include <linux/smp_lock.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
-#include <linux/quotaops.h>
 #include <linux/acct.h>
 #include <linux/capability.h>
 #include <linux/cpumask.h>
@@ -1084,7 +1083,6 @@ static int do_umount(struct vfsmount *mnt, int flags)
                 down_write(&sb->s_umount);
                 if (!(sb->s_flags & MS_RDONLY)) {
                         lock_kernel();
-                        DQUOT_OFF(sb);
                         retval = do_remount_sb(sb, MS_RDONLY, NULL, 0);
                         unlock_kernel();
                 }