summaryrefslogtreecommitdiffstats
path: root/fs/ext2/xattr.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2010-07-21 23:13:36 +0200
committerAl Viro <viro@zeniv.linux.org.uk>2010-08-09 22:47:54 +0200
commit3889717d2851bf38015c0b291026c07c02264623 (patch)
tree730ce868c322caabfb550cae816c30d210f9d8be /fs/ext2/xattr.c
parentswitch minix to ->evict_inode(), fix write_inode/delete_inode race (diff)
downloadlinux-3889717d2851bf38015c0b291026c07c02264623.tar.xz
linux-3889717d2851bf38015c0b291026c07c02264623.zip
ext2: switch to dquot_free_block_nodirty()
brute-force conversion Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/ext2/xattr.c')
-rw-r--r--fs/ext2/xattr.c12
1 files changed, 8 insertions, 4 deletions
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;