reiserfs: Move quota calls out of write lock
Calls into highlevel quota code cannot happen under the write lock. These calls take dqio_mutex which ranks above write lock. So drop write lock before calling back into quota code. CC: stable@vger.kernel.org # >= 3.0 Signed-off-by: Jan Kara <jack@suse.cz>
This commit is contained in:
parent
361d94a338
commit
7af1168693
|
@ -1782,8 +1782,9 @@ int reiserfs_new_inode(struct reiserfs_transaction_handle *th,
|
||||||
|
|
||||||
BUG_ON(!th->t_trans_id);
|
BUG_ON(!th->t_trans_id);
|
||||||
|
|
||||||
dquot_initialize(inode);
|
reiserfs_write_unlock(inode->i_sb);
|
||||||
err = dquot_alloc_inode(inode);
|
err = dquot_alloc_inode(inode);
|
||||||
|
reiserfs_write_lock(inode->i_sb);
|
||||||
if (err)
|
if (err)
|
||||||
goto out_end_trans;
|
goto out_end_trans;
|
||||||
if (!dir->i_nlink) {
|
if (!dir->i_nlink) {
|
||||||
|
@ -1979,8 +1980,10 @@ int reiserfs_new_inode(struct reiserfs_transaction_handle *th,
|
||||||
|
|
||||||
out_end_trans:
|
out_end_trans:
|
||||||
journal_end(th, th->t_super, th->t_blocks_allocated);
|
journal_end(th, th->t_super, th->t_blocks_allocated);
|
||||||
|
reiserfs_write_unlock(inode->i_sb);
|
||||||
/* Drop can be outside and it needs more credits so it's better to have it outside */
|
/* Drop can be outside and it needs more credits so it's better to have it outside */
|
||||||
dquot_drop(inode);
|
dquot_drop(inode);
|
||||||
|
reiserfs_write_lock(inode->i_sb);
|
||||||
inode->i_flags |= S_NOQUOTA;
|
inode->i_flags |= S_NOQUOTA;
|
||||||
make_bad_inode(inode);
|
make_bad_inode(inode);
|
||||||
|
|
||||||
|
@ -3103,10 +3106,9 @@ int reiserfs_setattr(struct dentry *dentry, struct iattr *attr)
|
||||||
/* must be turned off for recursive notify_change calls */
|
/* must be turned off for recursive notify_change calls */
|
||||||
ia_valid = attr->ia_valid &= ~(ATTR_KILL_SUID|ATTR_KILL_SGID);
|
ia_valid = attr->ia_valid &= ~(ATTR_KILL_SUID|ATTR_KILL_SGID);
|
||||||
|
|
||||||
depth = reiserfs_write_lock_once(inode->i_sb);
|
|
||||||
if (is_quota_modification(inode, attr))
|
if (is_quota_modification(inode, attr))
|
||||||
dquot_initialize(inode);
|
dquot_initialize(inode);
|
||||||
|
depth = reiserfs_write_lock_once(inode->i_sb);
|
||||||
if (attr->ia_valid & ATTR_SIZE) {
|
if (attr->ia_valid & ATTR_SIZE) {
|
||||||
/* version 2 items will be caught by the s_maxbytes check
|
/* version 2 items will be caught by the s_maxbytes check
|
||||||
** done for us in vmtruncate
|
** done for us in vmtruncate
|
||||||
|
@ -3170,7 +3172,9 @@ int reiserfs_setattr(struct dentry *dentry, struct iattr *attr)
|
||||||
error = journal_begin(&th, inode->i_sb, jbegin_count);
|
error = journal_begin(&th, inode->i_sb, jbegin_count);
|
||||||
if (error)
|
if (error)
|
||||||
goto out;
|
goto out;
|
||||||
|
reiserfs_write_unlock_once(inode->i_sb, depth);
|
||||||
error = dquot_transfer(inode, attr);
|
error = dquot_transfer(inode, attr);
|
||||||
|
depth = reiserfs_write_lock_once(inode->i_sb);
|
||||||
if (error) {
|
if (error) {
|
||||||
journal_end(&th, inode->i_sb, jbegin_count);
|
journal_end(&th, inode->i_sb, jbegin_count);
|
||||||
goto out;
|
goto out;
|
||||||
|
|
|
@ -1968,7 +1968,9 @@ int reiserfs_paste_into_item(struct reiserfs_transaction_handle *th, struct tree
|
||||||
key2type(&(key->on_disk_key)));
|
key2type(&(key->on_disk_key)));
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
reiserfs_write_unlock(inode->i_sb);
|
||||||
retval = dquot_alloc_space_nodirty(inode, pasted_size);
|
retval = dquot_alloc_space_nodirty(inode, pasted_size);
|
||||||
|
reiserfs_write_lock(inode->i_sb);
|
||||||
if (retval) {
|
if (retval) {
|
||||||
pathrelse(search_path);
|
pathrelse(search_path);
|
||||||
return retval;
|
return retval;
|
||||||
|
@ -2061,9 +2063,11 @@ int reiserfs_insert_item(struct reiserfs_transaction_handle *th,
|
||||||
"reiserquota insert_item(): allocating %u id=%u type=%c",
|
"reiserquota insert_item(): allocating %u id=%u type=%c",
|
||||||
quota_bytes, inode->i_uid, head2type(ih));
|
quota_bytes, inode->i_uid, head2type(ih));
|
||||||
#endif
|
#endif
|
||||||
|
reiserfs_write_unlock(inode->i_sb);
|
||||||
/* We can't dirty inode here. It would be immediately written but
|
/* We can't dirty inode here. It would be immediately written but
|
||||||
* appropriate stat item isn't inserted yet... */
|
* appropriate stat item isn't inserted yet... */
|
||||||
retval = dquot_alloc_space_nodirty(inode, quota_bytes);
|
retval = dquot_alloc_space_nodirty(inode, quota_bytes);
|
||||||
|
reiserfs_write_lock(inode->i_sb);
|
||||||
if (retval) {
|
if (retval) {
|
||||||
pathrelse(path);
|
pathrelse(path);
|
||||||
return retval;
|
return retval;
|
||||||
|
|
|
@ -298,7 +298,9 @@ static int finish_unfinished(struct super_block *s)
|
||||||
retval = remove_save_link_only(s, &save_link_key, 0);
|
retval = remove_save_link_only(s, &save_link_key, 0);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
reiserfs_write_unlock(s);
|
||||||
dquot_initialize(inode);
|
dquot_initialize(inode);
|
||||||
|
reiserfs_write_lock(s);
|
||||||
|
|
||||||
if (truncate && S_ISDIR(inode->i_mode)) {
|
if (truncate && S_ISDIR(inode->i_mode)) {
|
||||||
/* We got a truncate request for a dir which is impossible.
|
/* We got a truncate request for a dir which is impossible.
|
||||||
|
@ -2108,13 +2110,15 @@ static int reiserfs_write_dquot(struct dquot *dquot)
|
||||||
REISERFS_QUOTA_TRANS_BLOCKS(dquot->dq_sb));
|
REISERFS_QUOTA_TRANS_BLOCKS(dquot->dq_sb));
|
||||||
if (ret)
|
if (ret)
|
||||||
goto out;
|
goto out;
|
||||||
|
reiserfs_write_unlock(dquot->dq_sb);
|
||||||
ret = dquot_commit(dquot);
|
ret = dquot_commit(dquot);
|
||||||
|
reiserfs_write_lock(dquot->dq_sb);
|
||||||
err =
|
err =
|
||||||
journal_end(&th, dquot->dq_sb,
|
journal_end(&th, dquot->dq_sb,
|
||||||
REISERFS_QUOTA_TRANS_BLOCKS(dquot->dq_sb));
|
REISERFS_QUOTA_TRANS_BLOCKS(dquot->dq_sb));
|
||||||
if (!ret && err)
|
if (!ret && err)
|
||||||
ret = err;
|
ret = err;
|
||||||
out:
|
out:
|
||||||
reiserfs_write_unlock(dquot->dq_sb);
|
reiserfs_write_unlock(dquot->dq_sb);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
@ -2130,13 +2134,15 @@ static int reiserfs_acquire_dquot(struct dquot *dquot)
|
||||||
REISERFS_QUOTA_INIT_BLOCKS(dquot->dq_sb));
|
REISERFS_QUOTA_INIT_BLOCKS(dquot->dq_sb));
|
||||||
if (ret)
|
if (ret)
|
||||||
goto out;
|
goto out;
|
||||||
|
reiserfs_write_unlock(dquot->dq_sb);
|
||||||
ret = dquot_acquire(dquot);
|
ret = dquot_acquire(dquot);
|
||||||
|
reiserfs_write_lock(dquot->dq_sb);
|
||||||
err =
|
err =
|
||||||
journal_end(&th, dquot->dq_sb,
|
journal_end(&th, dquot->dq_sb,
|
||||||
REISERFS_QUOTA_INIT_BLOCKS(dquot->dq_sb));
|
REISERFS_QUOTA_INIT_BLOCKS(dquot->dq_sb));
|
||||||
if (!ret && err)
|
if (!ret && err)
|
||||||
ret = err;
|
ret = err;
|
||||||
out:
|
out:
|
||||||
reiserfs_write_unlock(dquot->dq_sb);
|
reiserfs_write_unlock(dquot->dq_sb);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
@ -2150,19 +2156,21 @@ static int reiserfs_release_dquot(struct dquot *dquot)
|
||||||
ret =
|
ret =
|
||||||
journal_begin(&th, dquot->dq_sb,
|
journal_begin(&th, dquot->dq_sb,
|
||||||
REISERFS_QUOTA_DEL_BLOCKS(dquot->dq_sb));
|
REISERFS_QUOTA_DEL_BLOCKS(dquot->dq_sb));
|
||||||
|
reiserfs_write_unlock(dquot->dq_sb);
|
||||||
if (ret) {
|
if (ret) {
|
||||||
/* Release dquot anyway to avoid endless cycle in dqput() */
|
/* Release dquot anyway to avoid endless cycle in dqput() */
|
||||||
dquot_release(dquot);
|
dquot_release(dquot);
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
ret = dquot_release(dquot);
|
ret = dquot_release(dquot);
|
||||||
|
reiserfs_write_lock(dquot->dq_sb);
|
||||||
err =
|
err =
|
||||||
journal_end(&th, dquot->dq_sb,
|
journal_end(&th, dquot->dq_sb,
|
||||||
REISERFS_QUOTA_DEL_BLOCKS(dquot->dq_sb));
|
REISERFS_QUOTA_DEL_BLOCKS(dquot->dq_sb));
|
||||||
if (!ret && err)
|
if (!ret && err)
|
||||||
ret = err;
|
ret = err;
|
||||||
out:
|
|
||||||
reiserfs_write_unlock(dquot->dq_sb);
|
reiserfs_write_unlock(dquot->dq_sb);
|
||||||
|
out:
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2187,11 +2195,13 @@ static int reiserfs_write_info(struct super_block *sb, int type)
|
||||||
ret = journal_begin(&th, sb, 2);
|
ret = journal_begin(&th, sb, 2);
|
||||||
if (ret)
|
if (ret)
|
||||||
goto out;
|
goto out;
|
||||||
|
reiserfs_write_unlock(sb);
|
||||||
ret = dquot_commit_info(sb, type);
|
ret = dquot_commit_info(sb, type);
|
||||||
|
reiserfs_write_lock(sb);
|
||||||
err = journal_end(&th, sb, 2);
|
err = journal_end(&th, sb, 2);
|
||||||
if (!ret && err)
|
if (!ret && err)
|
||||||
ret = err;
|
ret = err;
|
||||||
out:
|
out:
|
||||||
reiserfs_write_unlock(sb);
|
reiserfs_write_unlock(sb);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
Reference in New Issue