Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3889717d authored by Al Viro's avatar Al Viro
Browse files

ext2: switch to dquot_free_block_nodirty() 



brute-force conversion

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 5ccb4a78

fs/ext2/balloc.c

+8 −4
Original line number Diff line number Diff line
@@ -571,7 +571,8 @@ void ext2_free_blocks (struct inode * inode, unsigned long block, 
error_return:

	brelse(bitmap_bh);

	release_blocks(sb, freed);

	dquot_free_block(inode, freed);

	dquot_free_block_nodirty(inode, freed);

	mark_inode_dirty(inode);

}



/**
@@ -1418,7 +1419,8 @@ ext2_fsblk_t ext2_new_blocks(struct inode *inode, ext2_fsblk_t goal, 


	*errp = 0;

	brelse(bitmap_bh);

	dquot_free_block(inode, *count-num);

	dquot_free_block_nodirty(inode, *count-num);

	mark_inode_dirty(inode);

	*count = num;

	return ret_block;
@@ -1428,8 +1430,10 @@ ext2_fsblk_t ext2_new_blocks(struct inode *inode, ext2_fsblk_t goal, 
	/*

	 * Undo the block allocation

	 */

	if (!performed_allocation)

		dquot_free_block(inode, *count);

	if (!performed_allocation) {

		dquot_free_block_nodirty(inode, *count);

		mark_inode_dirty(inode);

	}

	brelse(bitmap_bh);

	return 0;

}

fs/ext2/xattr.c

+8 −4
Original line number Diff line number Diff line
@@ -703,8 +703,10 @@ ext2_xattr_set2(struct inode *inode, struct buffer_head *old_bh, 
		 * written (only some dirty data were not) so we just proceed

		 * as if nothing happened and cleanup the unused block */

		if (error && error != -ENOSPC) {

			if (new_bh && new_bh != old_bh)

				dquot_free_block(inode, 1);

			if (new_bh && new_bh != old_bh) {

				dquot_free_block_nodirty(inode, 1);

				mark_inode_dirty(inode);

			}

			goto cleanup;

		}

	} else
@@ -736,7 +738,8 @@ ext2_xattr_set2(struct inode *inode, struct buffer_head *old_bh, 
			le32_add_cpu(&HDR(old_bh)->h_refcount, -1);

			if (ce)

				mb_cache_entry_release(ce);

			dquot_free_block(inode, 1);

			dquot_free_block_nodirty(inode, 1);

			mark_inode_dirty(inode);

			mark_buffer_dirty(old_bh);

			ea_bdebug(old_bh, "refcount now=%d",

				le32_to_cpu(HDR(old_bh)->h_refcount));
@@ -799,7 +802,8 @@ ext2_xattr_delete_inode(struct inode *inode) 
		mark_buffer_dirty(bh);

		if (IS_SYNC(inode))

			sync_dirty_buffer(bh);

		dquot_free_block(inode, 1);

		dquot_free_block_nodirty(inode, 1);

		mark_inode_dirty(inode);

	}

	EXT2_I(inode)->i_file_acl = 0;