Take dirtying the inode to callers of ext2_free_blocks()

Al Viro · Al Viro · commit addacc7d6f0f · 2010-08-09T16:47:55.000-04:00
Signed-off-by: Al Viro &lt;viro@zeniv.linux.org.uk&gt;
diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c
@@ -572,7 +572,6 @@ void ext2_free_blocks (struct inode * inode, unsigned long block,
 	brelse(bitmap_bh);
 	release_blocks(sb, freed);
 	dquot_free_block_nodirty(inode, freed);
-	mark_inode_dirty(inode);
 }
 
 /**
diff --git a/fs/ext2/inode.c b/fs/ext2/inode.c
@@ -423,6 +423,8 @@ static int ext2_alloc_blocks(struct inode *inode,
 failed_out:
 	for (i = 0; i <index; i++)
 		ext2_free_blocks(inode, new_blocks[i], 1);
+	if (index)
+		mark_inode_dirty(inode);
 	return ret;
 }
 
@@ -993,17 +995,17 @@ static inline void ext2_free_data(struct inode *inode, __le32 *p, __le32 *q)
 			else if (block_to_free == nr - count)
 				count++;
 			else {
-				mark_inode_dirty(inode);
 				ext2_free_blocks (inode, block_to_free, count);
+				mark_inode_dirty(inode);
 			free_this:
 				block_to_free = nr;
 				count = 1;
 			}
 		}
 	}
 	if (count > 0) {
-		mark_inode_dirty(inode);
 		ext2_free_blocks (inode, block_to_free, count);
+		mark_inode_dirty(inode);
 	}
 }
 
diff --git a/fs/ext2/xattr.c b/fs/ext2/xattr.c
@@ -674,6 +674,7 @@ ext2_xattr_set2(struct inode *inode, struct buffer_head *old_bh,
 			new_bh = sb_getblk(sb, block);
 			if (!new_bh) {
 				ext2_free_blocks(inode, block, 1);
+				mark_inode_dirty(inode);
 				error = -EIO;
 				goto cleanup;
 			}
@@ -729,6 +730,7 @@ ext2_xattr_set2(struct inode *inode, struct buffer_head *old_bh,
 				mb_cache_entry_free(ce);
 			ea_bdebug(old_bh, "freeing");
 			ext2_free_blocks(inode, old_bh->b_blocknr, 1);
+			mark_inode_dirty(inode);
 			/* We let our caller release old_bh, so we
 			 * need to duplicate the buffer before. */
 			get_bh(old_bh);
@@ -789,6 +791,7 @@ ext2_xattr_delete_inode(struct inode *inode)
 		if (ce)
 			mb_cache_entry_free(ce);
 		ext2_free_blocks(inode, EXT2_I(inode)->i_file_acl, 1);
+		mark_inode_dirty(inode);
 		get_bh(bh);
 		bforget(bh);
 		unlock_buffer(bh);

Original file line number	Diff line number	Diff line change
`@@ -572,7 +572,6 @@ void ext2_free_blocks (struct inode * inode, unsigned long block,`
`572`	`572`	`brelse(bitmap_bh);`
`573`	`573`	`release_blocks(sb, freed);`
`574`	`574`	`dquot_free_block_nodirty(inode, freed);`
`575`		`- mark_inode_dirty(inode);`
`576`	`575`	`}`
`577`	`576`
`578`	`577`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -423,6 +423,8 @@ static int ext2_alloc_blocks(struct inode *inode,`
`423`	`423`	`failed_out:`
`424`	`424`	`for (i = 0; i <index; i++)`
`425`	`425`	`ext2_free_blocks(inode, new_blocks[i], 1);`
	`426`	`+ if (index)`
	`427`	`+ mark_inode_dirty(inode);`
`426`	`428`	`return ret;`
`427`	`429`	`}`
`428`	`430`
`@@ -993,17 +995,17 @@ static inline void ext2_free_data(struct inode inode, __le32 p, __le32 *q)`
`993`	`995`	`else if (block_to_free == nr - count)`
`994`	`996`	`count++;`
`995`	`997`	`else {`
`996`		`- mark_inode_dirty(inode);`
`997`	`998`	`ext2_free_blocks (inode, block_to_free, count);`
	`999`	`+ mark_inode_dirty(inode);`
`998`	`1000`	`free_this:`
`999`	`1001`	`block_to_free = nr;`
`1000`	`1002`	`count = 1;`
`1001`	`1003`	`}`
`1002`	`1004`	`}`
`1003`	`1005`	`}`
`1004`	`1006`	`if (count > 0) {`
`1005`		`- mark_inode_dirty(inode);`
`1006`	`1007`	`ext2_free_blocks (inode, block_to_free, count);`
	`1008`	`+ mark_inode_dirty(inode);`
`1007`	`1009`	`}`
`1008`	`1010`	`}`
`1009`	`1011`