diff options
author | Jan Kara <jack@suse.cz> | 2009-07-22 07:17:16 -0400 |
---|---|---|
committer | Joel Becker <joel.becker@oracle.com> | 2009-07-23 13:59:05 -0400 |
commit | 4b3fa1904c0d192461ebba692e4940a334b74353 (patch) | |
tree | f95a515b92fed5072b82b4848f469214d8a9d90f | |
parent | b57ac2c43e66cb4aa76c9d2d0e9e0e04f19cc5a6 (diff) |
ocfs2: Mark buffer uptodate before calling ocfs2_journal_access_dq()
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>
-rw-r--r-- | fs/ocfs2/quota_local.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/ocfs2/quota_local.c b/fs/ocfs2/quota_local.c index 5a460fa82553..b624f9bc9281 100644 --- a/fs/ocfs2/quota_local.c +++ b/fs/ocfs2/quota_local.c | |||
@@ -20,6 +20,7 @@ | |||
20 | #include "sysfile.h" | 20 | #include "sysfile.h" |
21 | #include "dlmglue.h" | 21 | #include "dlmglue.h" |
22 | #include "quota.h" | 22 | #include "quota.h" |
23 | #include "uptodate.h" | ||
23 | 24 | ||
24 | /* Number of local quota structures per block */ | 25 | /* Number of local quota structures per block */ |
25 | static inline unsigned int ol_quota_entries_per_block(struct super_block *sb) | 26 | 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( | |||
979 | mlog_errno(status); | 980 | mlog_errno(status); |
980 | goto out; | 981 | goto out; |
981 | } | 982 | } |
983 | ocfs2_set_new_buffer_uptodate(lqinode, bh); | ||
984 | |||
982 | dchunk = (struct ocfs2_local_disk_chunk *)bh->b_data; | 985 | dchunk = (struct ocfs2_local_disk_chunk *)bh->b_data; |
983 | 986 | ||
984 | handle = ocfs2_start_trans(OCFS2_SB(sb), 2); | 987 | handle = ocfs2_start_trans(OCFS2_SB(sb), 2); |
@@ -999,7 +1002,6 @@ static struct ocfs2_quota_chunk *ocfs2_local_quota_add_chunk( | |||
999 | memset(dchunk->dqc_bitmap, 0, | 1002 | memset(dchunk->dqc_bitmap, 0, |
1000 | sb->s_blocksize - sizeof(struct ocfs2_local_disk_chunk) - | 1003 | sb->s_blocksize - sizeof(struct ocfs2_local_disk_chunk) - |
1001 | OCFS2_QBLK_RESERVED_SPACE); | 1004 | OCFS2_QBLK_RESERVED_SPACE); |
1002 | set_buffer_uptodate(bh); | ||
1003 | unlock_buffer(bh); | 1005 | unlock_buffer(bh); |
1004 | status = ocfs2_journal_dirty(handle, bh); | 1006 | status = ocfs2_journal_dirty(handle, bh); |
1005 | if (status < 0) { | 1007 | if (status < 0) { |