Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+5
-10
+1
-1
fs/ext3/inode.c
+1
-1
fs/ext3/inode.c
···
3291
3291
if (ext3_should_journal_data(inode))
3292
3292
ret = 3 * (bpp + indirects) + 2;
3293
3293
else
3294
-
ret = 2 * (bpp + indirects) + 2;
3294
+
ret = 2 * (bpp + indirects) + indirects + 2;
3295
3295
3296
3296
#ifdef CONFIG_QUOTA
3297
3297
/* We know that structure was already allocated during dquot_initialize so
+4
-9
fs/quota/dquot.c
+4
-9
fs/quota/dquot.c
···
442
442
*/
443
443
int dquot_commit(struct dquot *dquot)
444
444
{
445
-
int ret = 0, ret2 = 0;
445
+
int ret = 0;
446
446
struct quota_info *dqopt = sb_dqopt(dquot->dq_sb);
447
447
448
448
mutex_lock(&dqopt->dqio_mutex);
···
454
454
spin_unlock(&dq_list_lock);
455
455
/* Inactive dquot can be only if there was error during read/init
456
456
* => we have better not writing it */
457
-
if (test_bit(DQ_ACTIVE_B, &dquot->dq_flags)) {
457
+
if (test_bit(DQ_ACTIVE_B, &dquot->dq_flags))
458
458
ret = dqopt->ops[dquot->dq_type]->commit_dqblk(dquot);
459
-
if (info_dirty(&dqopt->info[dquot->dq_type])) {
460
-
ret2 = dqopt->ops[dquot->dq_type]->write_file_info(
461
-
dquot->dq_sb, dquot->dq_type);
462
-
}
463
-
if (ret >= 0)
464
-
ret = ret2;
465
-
}
459
+
else
460
+
ret = -EIO;
466
461
out_sem:
467
462
mutex_unlock(&dqopt->dqio_mutex);
468
463
return ret;