2.6.25-rc1

 fs

diff --git a/fs/super.c b/fs/super.c
index ceaf2e3..88811f6 100644
--- a/fs/super.c
+++ b/fs/super.c
@@ -105,6 +105,7 @@ static inline void destroy_super(struct super_block *s)
 {
    security_sb_free(s);
    kfree(s->s_subtype);
+   kfree(s->s_options);
    kfree(s);
 }
 
@@ -603,6 +604,7 @@ int do_remount_sb(struct super_block *sb, int flags, void *data, int force)
          mark_files_ro(sb);
       else if (!fs_may_remount_ro(sb))
          return -EBUSY;
+      DQUOT_OFF(sb);
    }
 
    if (sb->s_op->remount_fs) {