lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Take dirtying the inode to callers of ext2_free_blocks()

Browse Source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro
2010-07-22 01:19:42 +04:00
parent 3889717d28
commit addacc7d6f
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
fs/ext2/balloc.c
View File

@@ -572,7 +572,6 @@ error_return:
brelse(bitmap_bh); brelse(bitmap_bh);
release_blocks(sb, freed); release_blocks(sb, freed);
dquot_free_block_nodirty(inode, freed); dquot_free_block_nodirty(inode, freed);
mark_inode_dirty(inode);
} }
/** /**

6
fs/ext2/inode.c
View File

@@ -423,6 +423,8 @@ static int ext2_alloc_blocks(struct inode *inode,
failed_out: failed_out:
for (i = 0; i <index; i++) for (i = 0; i <index; i++)
ext2_free_blocks(inode, new_blocks[i], 1); ext2_free_blocks(inode, new_blocks[i], 1);
if (index)
mark_inode_dirty(inode);
return ret; return ret;
} }
@@ -993,8 +995,8 @@ static inline void ext2_free_data(struct inode *inode, __le32 *p, __le32 *q)
else if (block_to_free == nr - count) else if (block_to_free == nr - count)
count++; count++;
else { else {
mark_inode_dirty(inode);
ext2_free_blocks (inode, block_to_free, count); ext2_free_blocks (inode, block_to_free, count);
mark_inode_dirty(inode);
free_this: free_this:
block_to_free = nr; block_to_free = nr;
count = 1; count = 1;
@@ -1002,8 +1004,8 @@ static inline void ext2_free_data(struct inode *inode, __le32 *p, __le32 *q)
} }
} }
if (count > 0) { if (count > 0) {
mark_inode_dirty(inode);
ext2_free_blocks (inode, block_to_free, count); ext2_free_blocks (inode, block_to_free, count);
mark_inode_dirty(inode);
} }
} }

3
fs/ext2/xattr.c
View File

@@ -674,6 +674,7 @@ ext2_xattr_set2(struct inode *inode, struct buffer_head *old_bh,
new_bh = sb_getblk(sb, block); new_bh = sb_getblk(sb, block);
if (!new_bh) { if (!new_bh) {
ext2_free_blocks(inode, block, 1); ext2_free_blocks(inode, block, 1);
mark_inode_dirty(inode);
error = -EIO; error = -EIO;
goto cleanup; goto cleanup;
} }
@@ -729,6 +730,7 @@ ext2_xattr_set2(struct inode *inode, struct buffer_head *old_bh,
mb_cache_entry_free(ce); mb_cache_entry_free(ce);
ea_bdebug(old_bh, "freeing"); ea_bdebug(old_bh, "freeing");
ext2_free_blocks(inode, old_bh->b_blocknr, 1); ext2_free_blocks(inode, old_bh->b_blocknr, 1);
mark_inode_dirty(inode);
/* We let our caller release old_bh, so we /* We let our caller release old_bh, so we
* need to duplicate the buffer before. */ * need to duplicate the buffer before. */
get_bh(old_bh); get_bh(old_bh);
@@ -789,6 +791,7 @@ ext2_xattr_delete_inode(struct inode *inode)
if (ce) if (ce)
mb_cache_entry_free(ce); mb_cache_entry_free(ce);
ext2_free_blocks(inode, EXT2_I(inode)->i_file_acl, 1); ext2_free_blocks(inode, EXT2_I(inode)->i_file_acl, 1);
mark_inode_dirty(inode);
get_bh(bh); get_bh(bh);
bforget(bh); bforget(bh);
unlock_buffer(bh); unlock_buffer(bh);