diff options
| author | Jan Kara <jack@suse.cz> | 2012-11-13 18:25:38 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-26 12:14:21 -0800 |
| commit | 2811150bc6fc7a64393531dc4cb3d2a9c586e977 (patch) | |
| tree | 7ff59641817a445d515b061400e9cc2774fce92b | |
| parent | 94bdc251fe3e4c14edc5d71d7197ec6e4046f715 (diff) | |
| download | lwn-2811150bc6fc7a64393531dc4cb3d2a9c586e977.tar.gz lwn-2811150bc6fc7a64393531dc4cb3d2a9c586e977.zip | |
reiserfs: Protect reiserfs_quota_write() with write lock
commit 361d94a338a3fd0cee6a4ea32bbc427ba228e628 upstream.
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.
Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -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 4f3d1c79c84e..4300030788d1 100644 --- a/fs/reiserfs/super.c +++ b/fs/reiserfs/super.c @@ -2343,7 +2343,9 @@ static ssize_t reiserfs_quota_write(struct super_block *sb, int type, tocopy = sb->s_blocksize - offset < towrite ? sb->s_blocksize - offset : towrite; tmp_bh.b_state = 0; + reiserfs_write_lock(sb); err = reiserfs_get_block(inode, blk, &tmp_bh, GET_BLOCK_CREATE); + reiserfs_write_unlock(sb); if (err) goto out; if (offset || tocopy != sb->s_blocksize) @@ -2359,10 +2361,12 @@ static ssize_t reiserfs_quota_write(struct super_block *sb, int type, flush_dcache_page(bh->b_page); set_buffer_uptodate(bh); unlock_buffer(bh); + reiserfs_write_lock(sb); reiserfs_prepare_for_journal(sb, bh, 1); journal_mark_dirty(current->journal_info, sb, bh); if (!journal_quota) reiserfs_add_ordered_list(inode, bh); + reiserfs_write_unlock(sb); brelse(bh); offset = 0; towrite -= tocopy; |