From: Theodore Ts'o <tytso@mit.edu>
Date: Sat, 16 Aug 2008 11:57:35 +0000 (-0400)
Subject: ext4: Use ext4_discard_reservations instead of mballoc-specific call
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=88aa3cff4e9a38b953de9fbc54c96e619a2bb9f9;p=linux-2.6

ext4: Use ext4_discard_reservations instead of mballoc-specific call

In ext4_ext_truncate(), we should use the more generic
ext4_discard_reservations() call so we do the right thing when the
filesystem is mounted with the nomballoc option.

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Reviewed-by: Mingming Cao <cmm@us.ibm.com>
---

diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
index 612c3d2c38..7212947a8c 100644
--- a/fs/ext4/extents.c
+++ b/fs/ext4/extents.c
@@ -2819,7 +2819,7 @@ void ext4_ext_truncate(struct inode *inode)
 	down_write(&EXT4_I(inode)->i_data_sem);
 	ext4_ext_invalidate_cache(inode);
 
-	ext4_mb_discard_inode_preallocations(inode);
+	ext4_discard_reservation(inode);
 
 	/*
 	 * TODO: optimization is possible here.