patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / fs / ext3 / super.c

diff --git a/fs/ext3/super.c b/fs/ext3/super.c
index 4bbb5a0..cf48f61 100644 (file)
--- a/fs/ext3/super.c
+++ b/fs/ext3/super.c
@@ -521,6 +521,8 @@ static void ext3_clear_inode(struct inode *inode)
 static int ext3_dquot_initialize(struct inode *inode, int type);
 static int ext3_dquot_drop(struct inode *inode);
 static int ext3_write_dquot(struct dquot *dquot);
+static int ext3_acquire_dquot(struct dquot *dquot);
+static int ext3_release_dquot(struct dquot *dquot);
 static int ext3_mark_dquot_dirty(struct dquot *dquot);
 static int ext3_write_info(struct super_block *sb, int type);
 static int ext3_quota_on(struct super_block *sb, int type, int format_id, char *path);
@@ -536,6 +538,8 @@ static struct dquot_operations ext3_quota_operations = {
        .free_inode     = dquot_free_inode,
        .transfer       = dquot_transfer,
        .write_dquot    = ext3_write_dquot,
+       .acquire_dquot  = ext3_acquire_dquot,
+       .release_dquot  = ext3_release_dquot,
        .mark_dirty     = ext3_mark_dquot_dirty,
        .write_info     = ext3_write_info
 };
@@ -583,7 +587,7 @@ enum {
        Opt_abort, Opt_data_journal, Opt_data_ordered, Opt_data_writeback,
        Opt_usrjquota, Opt_grpjquota, Opt_offusrjquota, Opt_offgrpjquota,
        Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0,
-       Opt_ignore, Opt_err,
+       Opt_tagxid, Opt_ignore, Opt_err,
 };
 
 static match_table_t tokens = {
@@ -624,6 +628,7 @@ static match_table_t tokens = {
        {Opt_grpjquota, "grpjquota=%s"},
        {Opt_jqfmt_vfsold, "jqfmt=vfsold"},
        {Opt_jqfmt_vfsv0, "jqfmt=vfsv0"},
+       {Opt_tagxid, "tagxid"},
        {Opt_ignore, "grpquota"},
        {Opt_ignore, "noquota"},
        {Opt_ignore, "quota"},
@@ -717,6 +722,11 @@ static int parse_options (char * options, struct super_block *sb,
                case Opt_nouid32:
                        set_opt (sbi->s_mount_opt, NO_UID32);
                        break;
+#ifndef CONFIG_INOXID_NONE
+               case Opt_tagxid:
+                       set_opt (sbi->s_mount_opt, TAG_XID);
+                       break;
+#endif
                case Opt_check:
 #ifdef CONFIG_EXT3_CHECK
                        set_opt (sbi->s_mount_opt, CHECK);
@@ -1287,6 +1297,8 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent)
        if (!parse_options ((char *) data, sb, &journal_inum, 0))
                goto failed_mount;
 
+       if (EXT3_SB(sb)->s_mount_opt & EXT3_MOUNT_TAG_XID)
+               sb->s_flags |= MS_TAGXID;
        sb->s_flags |= MS_ONE_SECOND;
        sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
                ((sbi->s_mount_opt & EXT3_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0);
@@ -1639,6 +1651,7 @@ static journal_t *ext3_get_journal(struct super_block *sb, int journal_inum)
        if (!journal) {
                printk(KERN_ERR "EXT3-fs: Could not load journal inode\n");
                iput(journal_inode);
+               return NULL;
        }
        journal->j_private = sb;
        ext3_init_journal_params(EXT3_SB(sb), journal);
@@ -1870,13 +1883,17 @@ static void ext3_commit_super (struct super_block * sb,
 static void ext3_mark_recovery_complete(struct super_block * sb,
                                        struct ext3_super_block * es)
 {
-       journal_flush(EXT3_SB(sb)->s_journal);
+       journal_t *journal = EXT3_SB(sb)->s_journal;
+
+       journal_lock_updates(journal);
+       journal_flush(journal);
        if (EXT3_HAS_INCOMPAT_FEATURE(sb, EXT3_FEATURE_INCOMPAT_RECOVER) &&
            sb->s_flags & MS_RDONLY) {
                EXT3_CLEAR_INCOMPAT_FEATURE(sb, EXT3_FEATURE_INCOMPAT_RECOVER);
                sb->s_dirt = 0;
                ext3_commit_super(sb, es, 1);
        }
+       journal_unlock_updates(journal);
 }
 
 /*
@@ -2181,6 +2198,38 @@ static int ext3_write_dquot(struct dquot *dquot)
        return ret;
 }
 
+static int ext3_acquire_dquot(struct dquot *dquot)
+{
+       int ret, err;
+       handle_t *handle;
+
+       handle = ext3_journal_start(dquot_to_inode(dquot),
+                                       EXT3_QUOTA_INIT_BLOCKS);
+       if (IS_ERR(handle))
+               return PTR_ERR(handle);
+       ret = dquot_acquire(dquot);
+       err = ext3_journal_stop(handle);
+       if (!ret)
+               ret = err;
+       return ret;
+}
+
+static int ext3_release_dquot(struct dquot *dquot)
+{
+       int ret, err;
+       handle_t *handle;
+
+       handle = ext3_journal_start(dquot_to_inode(dquot),
+                                       EXT3_QUOTA_INIT_BLOCKS);
+       if (IS_ERR(handle))
+               return PTR_ERR(handle);
+       ret = dquot_release(dquot);
+       err = ext3_journal_stop(handle);
+       if (!ret)
+               ret = err;
+       return ret;
+}
+
 static int ext3_mark_dquot_dirty(struct dquot *dquot)
 {
        /* Are we journalling quotas? */