[gentoo-commits] linux-patches r1544 - genpatches-2.6/trunk/2.6.29

[Mike Pagano (mpagano)]

Author: mpagano
Date: 2009-04-06 14:26:48 +0000 (Mon, 06 Apr 2009)
New Revision: 1544

Added:
   genpatches-2.6/trunk/2.6.29/1918_ext4-fix-discard-of-inode-prealloc-space-with-delayed-allocation.patch
Modified:
   genpatches-2.6/trunk/2.6.29/0000_README
Log:
ext4 patch to fix discard of inode prealloc space with delayed allocation

Modified: genpatches-2.6/trunk/2.6.29/0000_README
===================================================================
--- genpatches-2.6/trunk/2.6.29/0000_README	2009-04-04 23:49:11 UTC (rev 1543)
+++ genpatches-2.6/trunk/2.6.29/0000_README	2009-04-06 14:26:48 UTC (rev 1544)
@@ -55,6 +55,10 @@
 From:   Theodore Ts'o <tytso@×××.edu>
 Desc:   ext4: add EXT4_IOC_ALLOC_DA_BLKS ioctl
 
+Patch:  1918_ext4-fix-discard-of-inode-prealloc-space-with-delayed-allocation.patch
+From:   Aneesh Kumar K.V <aneesh.kumar@××××××××××××××.com>
+Desc:   ext4: Fix discard of inode prealloc space with delayed allocation
+
 Patch:	4100_dm-bbr.patch
 From:	EVMS 2.5.2
 Desc:	Bad block relocation support for LiveCD users

Added: genpatches-2.6/trunk/2.6.29/1918_ext4-fix-discard-of-inode-prealloc-space-with-delayed-allocation.patch
===================================================================
--- genpatches-2.6/trunk/2.6.29/1918_ext4-fix-discard-of-inode-prealloc-space-with-delayed-allocation.patch	                        (rev 0)
+++ genpatches-2.6/trunk/2.6.29/1918_ext4-fix-discard-of-inode-prealloc-space-with-delayed-allocation.patch	2009-04-06 14:26:48 UTC (rev 1544)
@@ -0,0 +1,53 @@
+Added-By: Gordon Malm <gengor@g.o>
+
+---
+From: Aneesh Kumar K.V <aneesh.kumar@××××××××××××××.com>
+Date: Thu, 26 Feb 2009 05:54:52 +0000 (-0500)
+Subject: ext4: Fix discard of inode prealloc space with delayed allocation.
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftytso%2Fext4.git;a=commitdiff_plain;h=3cb5e61547e9ee5f040d7a02c48c7cdf6485eecc
+
+ext4: Fix discard of inode prealloc space with delayed allocation.
+
+With delayed allocation we should not/cannot discard inode prealloc
+space during file close. We would still have dirty pages for which we
+haven't allocated blocks yet. With this fix after each get_blocks
+request we check whether we have zero reserved blocks and if yes and
+we don't have any writers on the file we discard inode prealloc space.
+
+Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@××××××××××××××.com>
+Signed-off-by: "Theodore Ts'o" <tytso@×××.edu>
+---
+
+diff --git a/fs/ext4/file.c b/fs/ext4/file.c
+index 06df827..588af8c 100644
+--- a/fs/ext4/file.c
++++ b/fs/ext4/file.c
+@@ -39,7 +39,8 @@ static int ext4_release_file(struct inode *inode, struct file *filp)
+ 	}
+ 	/* if we are the last writer on the inode, drop the block reservation */
+ 	if ((filp->f_mode & FMODE_WRITE) &&
+-			(atomic_read(&inode->i_writecount) == 1))
++			(atomic_read(&inode->i_writecount) == 1) &&
++		        !EXT4_I(inode)->i_reserved_data_blocks)
+ 	{
+ 		down_write(&EXT4_I(inode)->i_data_sem);
+ 		ext4_discard_preallocations(inode);
+diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
+index 666caa9..8815b9c 100644
+--- a/fs/ext4/inode.c
++++ b/fs/ext4/inode.c
+@@ -1053,6 +1053,14 @@ static void ext4_da_update_reserve_space(struct inode *inode, int used)
+ 	EXT4_I(inode)->i_reserved_data_blocks -= used;
+ 
+ 	spin_unlock(&EXT4_I(inode)->i_block_reservation_lock);
++
++	/*
++	 * If have done all the pending block allocation and if the we
++	 * don't have any writer on the inode, we can discard the
++	 * inode's preallocations.
++	 */
++	if (!total && (atomic_read(&inode->i_writecount) == 0))
++		ext4_discard_preallocations(inode);
+ }
+ 
+ /*