diff options
author | Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> | 2009-03-27 22:36:43 -0400 |
---|---|---|
committer | Theodore Ts'o <tytso@mit.edu> | 2009-03-27 22:36:43 -0400 |
commit | d6014301b5599fba395c42a1e96a7fe86f7d0b2d (patch) | |
tree | 5b3f8c034c69dfbcc0f4e155dc991179a95e170b /fs | |
parent | 8750c6d5fcbd3342b3d908d157f81d345c5325a7 (diff) |
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@linux.vnet.ibm.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/ext4/file.c | 3 | ||||
-rw-r--r-- | fs/ext4/inode.c | 9 |
2 files changed, 10 insertions, 2 deletions
diff --git a/fs/ext4/file.c b/fs/ext4/file.c index 06df8272c639..588af8c77246 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) | |||
39 | } | 39 | } |
40 | /* if we are the last writer on the inode, drop the block reservation */ | 40 | /* if we are the last writer on the inode, drop the block reservation */ |
41 | if ((filp->f_mode & FMODE_WRITE) && | 41 | if ((filp->f_mode & FMODE_WRITE) && |
42 | (atomic_read(&inode->i_writecount) == 1)) | 42 | (atomic_read(&inode->i_writecount) == 1) && |
43 | !EXT4_I(inode)->i_reserved_data_blocks) | ||
43 | { | 44 | { |
44 | down_write(&EXT4_I(inode)->i_data_sem); | 45 | down_write(&EXT4_I(inode)->i_data_sem); |
45 | ext4_discard_preallocations(inode); | 46 | ext4_discard_preallocations(inode); |
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 80ed6dc9c9d2..7dcac9d7e491 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c | |||
@@ -1067,9 +1067,16 @@ static void ext4_da_update_reserve_space(struct inode *inode, int used) | |||
1067 | /* | 1067 | /* |
1068 | * free those over-booking quota for metadata blocks | 1068 | * free those over-booking quota for metadata blocks |
1069 | */ | 1069 | */ |
1070 | |||
1071 | if (mdb_free) | 1070 | if (mdb_free) |
1072 | vfs_dq_release_reservation_block(inode, mdb_free); | 1071 | vfs_dq_release_reservation_block(inode, mdb_free); |
1072 | |||
1073 | /* | ||
1074 | * If we have done all the pending block allocations and if | ||
1075 | * there aren't any writers on the inode, we can discard the | ||
1076 | * inode's preallocations. | ||
1077 | */ | ||
1078 | if (!total && (atomic_read(&inode->i_writecount) == 0)) | ||
1079 | ext4_discard_preallocations(inode); | ||
1073 | } | 1080 | } |
1074 | 1081 | ||
1075 | /* | 1082 | /* |