Commit af09e51b authored by Jan Kara's avatar Jan Kara Committed by Mark Fasheh

ocfs2: Fix oops when extending quota files

We have to mark buffer as uptodate before calling ocfs2_journal_access() and
ocfs2_set_buffer_uptodate() does not do this for us.
Signed-off-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarMark Fasheh <mfasheh@suse.com>
parent 85eb8b73
...@@ -174,7 +174,7 @@ ssize_t ocfs2_quota_write(struct super_block *sb, int type, ...@@ -174,7 +174,7 @@ ssize_t ocfs2_quota_write(struct super_block *sb, int type,
struct inode *gqinode = oinfo->dqi_gqinode; struct inode *gqinode = oinfo->dqi_gqinode;
int offset = off & (sb->s_blocksize - 1); int offset = off & (sb->s_blocksize - 1);
sector_t blk = off >> sb->s_blocksize_bits; sector_t blk = off >> sb->s_blocksize_bits;
int err = 0, new = 0; int err = 0, new = 0, ja_type;
struct buffer_head *bh = NULL; struct buffer_head *bh = NULL;
handle_t *handle = journal_current_handle(); handle_t *handle = journal_current_handle();
...@@ -207,32 +207,28 @@ ssize_t ocfs2_quota_write(struct super_block *sb, int type, ...@@ -207,32 +207,28 @@ ssize_t ocfs2_quota_write(struct super_block *sb, int type,
if ((offset || len < sb->s_blocksize - OCFS2_QBLK_RESERVED_SPACE) && if ((offset || len < sb->s_blocksize - OCFS2_QBLK_RESERVED_SPACE) &&
!new) { !new) {
err = ocfs2_read_quota_block(gqinode, blk, &bh); err = ocfs2_read_quota_block(gqinode, blk, &bh);
if (err) { ja_type = OCFS2_JOURNAL_ACCESS_WRITE;
mlog_errno(err);
return err;
}
err = ocfs2_journal_access(handle, gqinode, bh,
OCFS2_JOURNAL_ACCESS_WRITE);
} else { } else {
bh = ocfs2_get_quota_block(gqinode, blk, &err); bh = ocfs2_get_quota_block(gqinode, blk, &err);
if (!bh) { ja_type = OCFS2_JOURNAL_ACCESS_CREATE;
}
if (err) {
mlog_errno(err); mlog_errno(err);
return err; return err;
} }
err = ocfs2_journal_access(handle, gqinode, bh,
OCFS2_JOURNAL_ACCESS_CREATE);
}
if (err < 0) {
brelse(bh);
goto out;
}
lock_buffer(bh); lock_buffer(bh);
if (new) if (new)
memset(bh->b_data, 0, sb->s_blocksize); memset(bh->b_data, 0, sb->s_blocksize);
memcpy(bh->b_data + offset, data, len); memcpy(bh->b_data + offset, data, len);
flush_dcache_page(bh->b_page); flush_dcache_page(bh->b_page);
set_buffer_uptodate(bh);
unlock_buffer(bh); unlock_buffer(bh);
ocfs2_set_buffer_uptodate(gqinode, bh); ocfs2_set_buffer_uptodate(gqinode, bh);
err = ocfs2_journal_access(handle, gqinode, bh, ja_type);
if (err < 0) {
brelse(bh);
goto out;
}
err = ocfs2_journal_dirty(handle, bh); err = ocfs2_journal_dirty(handle, bh);
brelse(bh); brelse(bh);
if (err < 0) if (err < 0)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment