leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ext2: switch to dquot_free_block_nodirty()

Browse Source 
brute-force conversion

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2010-07-22 01:13:36 +04:00
parent 5ccb4a78d8
commit 3889717d28
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fs/ext2/balloc.c
View File

@ -571,7 +571,8 @@ do_more:
error_return: error_return:
brelse(bitmap_bh); brelse(bitmap_bh);
release_blocks(sb, freed); release_blocks(sb, freed);
dquot_free_block(inode, freed); dquot_free_block_nodirty(inode, freed);
mark_inode_dirty(inode);
} }
/** /**
@ -1418,7 +1419,8 @@ allocated:
*errp = 0; *errp = 0;
brelse(bitmap_bh); brelse(bitmap_bh);
dquot_free_block(inode, *count-num); dquot_free_block_nodirty(inode, *count-num);
mark_inode_dirty(inode);
*count = num; *count = num;
return ret_block; return ret_block;
@ -1428,8 +1430,10 @@ out:
/* /*
* Undo the block allocation * Undo the block allocation
*/ */
if (!performed_allocation) if (!performed_allocation) {
dquot_free_block(inode, *count); dquot_free_block_nodirty(inode, *count);
mark_inode_dirty(inode);
}
brelse(bitmap_bh); brelse(bitmap_bh);
return 0; return 0;
} }

12
fs/ext2/xattr.c
View File

@ -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 * written (only some dirty data were not) so we just proceed
* as if nothing happened and cleanup the unused block */ * as if nothing happened and cleanup the unused block */
if (error && error != -ENOSPC) { if (error && error != -ENOSPC) {
if (new_bh && new_bh != old_bh) if (new_bh && new_bh != old_bh) {
dquot_free_block(inode, 1); dquot_free_block_nodirty(inode, 1);
mark_inode_dirty(inode);
}
goto cleanup; goto cleanup;
} }
} else } 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); le32_add_cpu(&HDR(old_bh)->h_refcount, -1);
if (ce) if (ce)
mb_cache_entry_release(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); mark_buffer_dirty(old_bh);
ea_bdebug(old_bh, "refcount now=%d", ea_bdebug(old_bh, "refcount now=%d",
le32_to_cpu(HDR(old_bh)->h_refcount)); le32_to_cpu(HDR(old_bh)->h_refcount));
@ -799,7 +802,8 @@ ext2_xattr_delete_inode(struct inode *inode)
mark_buffer_dirty(bh); mark_buffer_dirty(bh);
if (IS_SYNC(inode)) if (IS_SYNC(inode))
sync_dirty_buffer(bh); 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; EXT2_I(inode)->i_file_acl = 0;