Commit 3d762ca1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6 

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6:
  quota: Don't write quota info in dquot_commit()
  ext3: Fix writepage credits computation for ordered mode
parents 0c3efe54 b03f2456

fs/ext3/inode.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -3291,7 +3291,7 @@ static int ext3_writepage_trans_blocks(struct inode *inode) 
	if (ext3_should_journal_data(inode))

	if (ext3_should_journal_data(inode))

		ret = 3 * (bpp + indirects) + 2;

		ret = 3 * (bpp + indirects) + 2;

	else

	else

		ret = 2 * (bpp + indirects) + 2;

		ret = 2 * (bpp + indirects) + indirects + 2;





#ifdef CONFIG_QUOTA

#ifdef CONFIG_QUOTA

	/* We know that structure was already allocated during dquot_initialize so

	/* We know that structure was already allocated during dquot_initialize so

fs/quota/dquot.c

+4 −9
Original line number Original line Diff line number Diff line
@@ -442,7 +442,7 @@ EXPORT_SYMBOL(dquot_acquire); 
 */

 */

int dquot_commit(struct dquot *dquot)

int dquot_commit(struct dquot *dquot)

{

{

	int ret = 0, ret2 = 0;

	int ret = 0;

	struct quota_info *dqopt = sb_dqopt(dquot->dq_sb);

	struct quota_info *dqopt = sb_dqopt(dquot->dq_sb);





	mutex_lock(&dqopt->dqio_mutex);

	mutex_lock(&dqopt->dqio_mutex);
@@ -454,15 +454,10 @@ int dquot_commit(struct dquot *dquot) 
	spin_unlock(&dq_list_lock);

	spin_unlock(&dq_list_lock);

	/* Inactive dquot can be only if there was error during read/init

	/* Inactive dquot can be only if there was error during read/init

	 * => we have better not writing it */

	 * => we have better not writing it */

	if (test_bit(DQ_ACTIVE_B, &dquot->dq_flags)) {

	if (test_bit(DQ_ACTIVE_B, &dquot->dq_flags))

		ret = dqopt->ops[dquot->dq_type]->commit_dqblk(dquot);

		ret = dqopt->ops[dquot->dq_type]->commit_dqblk(dquot);

		if (info_dirty(&dqopt->info[dquot->dq_type])) {

	else

			ret2 = dqopt->ops[dquot->dq_type]->write_file_info(

		ret = -EIO;

						dquot->dq_sb, dquot->dq_type);

		}

		if (ret >= 0)

			ret = ret2;

	}

out_sem:

out_sem:

	mutex_unlock(&dqopt->dqio_mutex);

	mutex_unlock(&dqopt->dqio_mutex);

	return ret;

	return ret;