diff options
author | Jan Kara <jack@suse.cz> | 2012-11-13 12:25:38 -0500 |
---|---|---|
committer | Jan Kara <jack@suse.cz> | 2012-11-19 15:34:33 -0500 |
commit | 361d94a338a3fd0cee6a4ea32bbc427ba228e628 (patch) | |
tree | b6d47973fada0c3cdd633b292772e19679a4f2f2 /fs/reiserfs | |
parent | b9e06ef2e8706fe669b51f4364e3aeed58639eb2 (diff) |
reiserfs: Protect reiserfs_quota_write() with write lock
Calls into reiserfs journalling code and reiserfs_get_block() need to
be protected with write lock. We remove write lock around calls to high
level quota code in the next patch so these paths would suddently become
unprotected.
CC: stable@vger.kernel.org # >= 3.0
Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/reiserfs')
-rw-r--r-- | fs/reiserfs/super.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c index e59d6ddcc69f..c101704ece48 100644 --- a/fs/reiserfs/super.c +++ b/fs/reiserfs/super.c | |||
@@ -2338,7 +2338,9 @@ static ssize_t reiserfs_quota_write(struct super_block *sb, int type, | |||
2338 | tocopy = sb->s_blocksize - offset < towrite ? | 2338 | tocopy = sb->s_blocksize - offset < towrite ? |
2339 | sb->s_blocksize - offset : towrite; | 2339 | sb->s_blocksize - offset : towrite; |
2340 | tmp_bh.b_state = 0; | 2340 | tmp_bh.b_state = 0; |
2341 | reiserfs_write_lock(sb); | ||
2341 | err = reiserfs_get_block(inode, blk, &tmp_bh, GET_BLOCK_CREATE); | 2342 | err = reiserfs_get_block(inode, blk, &tmp_bh, GET_BLOCK_CREATE); |
2343 | reiserfs_write_unlock(sb); | ||
2342 | if (err) | 2344 | if (err) |
2343 | goto out; | 2345 | goto out; |
2344 | if (offset || tocopy != sb->s_blocksize) | 2346 | if (offset || tocopy != sb->s_blocksize) |
@@ -2354,10 +2356,12 @@ static ssize_t reiserfs_quota_write(struct super_block *sb, int type, | |||
2354 | flush_dcache_page(bh->b_page); | 2356 | flush_dcache_page(bh->b_page); |
2355 | set_buffer_uptodate(bh); | 2357 | set_buffer_uptodate(bh); |
2356 | unlock_buffer(bh); | 2358 | unlock_buffer(bh); |
2359 | reiserfs_write_lock(sb); | ||
2357 | reiserfs_prepare_for_journal(sb, bh, 1); | 2360 | reiserfs_prepare_for_journal(sb, bh, 1); |
2358 | journal_mark_dirty(current->journal_info, sb, bh); | 2361 | journal_mark_dirty(current->journal_info, sb, bh); |
2359 | if (!journal_quota) | 2362 | if (!journal_quota) |
2360 | reiserfs_add_ordered_list(inode, bh); | 2363 | reiserfs_add_ordered_list(inode, bh); |
2364 | reiserfs_write_unlock(sb); | ||
2361 | brelse(bh); | 2365 | brelse(bh); |
2362 | offset = 0; | 2366 | offset = 0; |
2363 | towrite -= tocopy; | 2367 | towrite -= tocopy; |