ocfs2: Mark buffer uptodate before calling ocfs2_journal_access_dq()
authorJan Kara <jack@suse.cz>
Wed, 22 Jul 2009 11:17:16 +0000 (13:17 +0200)
committerJoel Becker <joel.becker@oracle.com>
Thu, 23 Jul 2009 17:59:05 +0000 (10:59 -0700)
In a code path extending local quota files we marked new header
buffer uptodate only after calling ocfs2_journal_access_dq() which
triggers a bug. Fix it and also call ocfs2 variant of the function
marking buffer uptodate.

Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Joel Becker <joel.becker@oracle.com>
fs/ocfs2/quota_local.c

index 5a460fa8255384f615d2dd7ca8836d3091fc58b5..b624f9bc92819babf7cc63c8917d4af0e21a68f0 100644 (file)
@@ -20,6 +20,7 @@
 #include "sysfile.h"
 #include "dlmglue.h"
 #include "quota.h"
+#include "uptodate.h"
 
 /* Number of local quota structures per block */
 static inline unsigned int ol_quota_entries_per_block(struct super_block *sb)
@@ -979,6 +980,8 @@ static struct ocfs2_quota_chunk *ocfs2_local_quota_add_chunk(
                mlog_errno(status);
                goto out;
        }
+       ocfs2_set_new_buffer_uptodate(lqinode, bh);
+
        dchunk = (struct ocfs2_local_disk_chunk *)bh->b_data;
 
        handle = ocfs2_start_trans(OCFS2_SB(sb), 2);
@@ -999,7 +1002,6 @@ static struct ocfs2_quota_chunk *ocfs2_local_quota_add_chunk(
        memset(dchunk->dqc_bitmap, 0,
               sb->s_blocksize - sizeof(struct ocfs2_local_disk_chunk) -
               OCFS2_QBLK_RESERVED_SPACE);
-       set_buffer_uptodate(bh);
        unlock_buffer(bh);
        status = ocfs2_journal_dirty(handle, bh);
        if (status < 0) {