From: Theodore Ts'o <tytso@mit.edu>
Date: Mon, 15 Jul 2013 04:09:37 +0000 (-0400)
Subject: ext4: simplify calculation of blocks to free on error
X-Git-Tag: v3.11-rc2~5^2~3
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;ds=sidebyside;h=c8e15130e1636f68d5165aa2605b8e9cba0f644c;p=~andy%2Flinux

ext4: simplify calculation of blocks to free on error

In ext4_ext_map_blocks(), if we have successfully allocated the data
blocks, but then run into trouble inserting the extent into the extent
tree, most likely due to an ENOSPC condition, determine the arguments
to ext4_free_blocks() in a simpler way which is easier to prove to be
correct.

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
---

diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
index f57cc0e7f1b..593091537e7 100644
--- a/fs/ext4/extents.c
+++ b/fs/ext4/extents.c
@@ -4261,8 +4261,8 @@ got_allocated_blocks:
 		/* not a good idea to call discard here directly,
 		 * but otherwise we'd need to call it every free() */
 		ext4_discard_preallocations(inode);
-		ext4_free_blocks(handle, inode, NULL, ext4_ext_pblock(&newex),
-				 ext4_ext_get_actual_len(&newex), fb_flags);
+		ext4_free_blocks(handle, inode, NULL, newblock,
+				 EXT4_C2B(sbi, allocated_clusters), fb_flags);
 		goto out2;
 	}