Merge branch 'for-2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

[deliverable/linux.git] / fs / udf / super.c

diff --git a/fs/udf/super.c b/fs/udf/super.c
index ef9221b7456e3c9c0587a8abf116d658694a6baa..612d1e2e285a158bfd1bf7661621565dda955de9 100644 (file)
--- a/fs/udf/super.c
+++ b/fs/udf/super.c
@@ -54,7 +54,6 @@
 #include <linux/vmalloc.h>
 #include <linux/errno.h>
 #include <linux/mount.h>
-#include <linux/quotaops.h>
 #include <linux/seq_file.h>
 #include <linux/bitmap.h>
 #include <linux/crc-itu-t.h>
@@ -587,18 +586,11 @@ static int udf_remount_fs(struct super_block *sb, int *flags, char *options)
        if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY))
                goto out_unlock;
 
-       if (*flags & MS_RDONLY) {
+       if (*flags & MS_RDONLY)
                udf_close_lvid(sb);
-
-               error = dquot_suspend(sb, -1);
-       } else {
+       else
                udf_open_lvid(sb);
 
-               /* mark the fs r/w for quota activity */
-               sb->s_flags &= ~MS_RDONLY;
-               dquot_resume(sb, -1);
-       }
-
 out_unlock:
        unlock_kernel();
        return error;
@@ -1948,10 +1940,6 @@ static int udf_fill_super(struct super_block *sb, void *options, int silent)
        /* Fill in the rest of the superblock */
        sb->s_op = &udf_sb_ops;
        sb->s_export_op = &udf_export_ops;
-#ifdef CONFIG_QUOTA
-       sb->s_qcop = &vfs_quotactl_ops;
-       sb->dq_op = NULL; /* &dquot_operations */
-#endif
 
        sb->s_dirt = 0;
        sb->s_magic = UDF_SUPER_MAGIC;
@@ -2106,8 +2094,6 @@ static void udf_put_super(struct super_block *sb)
        int i;
        struct udf_sb_info *sbi;
 
-       dquot_disable(sb, -1, DQUOT_USAGE_ENABLED | DQUOT_LIMITS_ENABLED);
-
        sbi = UDF_SB(sb);
 
        lock_kernel();