From 3889717d2851bf38015c0b291026c07c02264623 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Thu, 22 Jul 2010 01:13:36 +0400 Subject: ext2: switch to dquot_free_block_nodirty() brute-force conversion Signed-off-by: Al Viro --- fs/ext2/xattr.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'fs/ext2/xattr.c') diff --git a/fs/ext2/xattr.c b/fs/ext2/xattr.c index 7c3915780b19..0fa24e814d8a 100644 --- a/fs/ext2/xattr.c +++ b/fs/ext2/xattr.c @@ -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; -- cgit v1.2.1