diff options
Diffstat (limited to 'fs')
-rw-r--r-- | fs/ext4/ext4.h | 1 | ||||
-rw-r--r-- | fs/ext4/file.c | 4 | ||||
-rw-r--r-- | fs/ext4/inode.c | 3 |
3 files changed, 8 insertions, 0 deletions
diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index b0ea70cc94db..1b0c17364631 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h | |||
@@ -270,6 +270,7 @@ static inline __u32 ext4_mask_flags(umode_t mode, __u32 flags) | |||
270 | #define EXT4_STATE_NEW 0x00000002 /* inode is newly created */ | 270 | #define EXT4_STATE_NEW 0x00000002 /* inode is newly created */ |
271 | #define EXT4_STATE_XATTR 0x00000004 /* has in-inode xattrs */ | 271 | #define EXT4_STATE_XATTR 0x00000004 /* has in-inode xattrs */ |
272 | #define EXT4_STATE_NO_EXPAND 0x00000008 /* No space for expansion */ | 272 | #define EXT4_STATE_NO_EXPAND 0x00000008 /* No space for expansion */ |
273 | #define EXT4_STATE_DA_ALLOC_CLOSE 0x00000010 /* Alloc DA blks on close */ | ||
273 | 274 | ||
274 | /* Used to pass group descriptor data when online resize is done */ | 275 | /* Used to pass group descriptor data when online resize is done */ |
275 | struct ext4_new_group_input { | 276 | struct ext4_new_group_input { |
diff --git a/fs/ext4/file.c b/fs/ext4/file.c index f731cb545a03..06df8272c639 100644 --- a/fs/ext4/file.c +++ b/fs/ext4/file.c | |||
@@ -33,6 +33,10 @@ | |||
33 | */ | 33 | */ |
34 | static int ext4_release_file(struct inode *inode, struct file *filp) | 34 | static int ext4_release_file(struct inode *inode, struct file *filp) |
35 | { | 35 | { |
36 | if (EXT4_I(inode)->i_state & EXT4_STATE_DA_ALLOC_CLOSE) { | ||
37 | ext4_alloc_da_blocks(inode); | ||
38 | EXT4_I(inode)->i_state &= ~EXT4_STATE_DA_ALLOC_CLOSE; | ||
39 | } | ||
36 | /* 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 */ |
37 | if ((filp->f_mode & FMODE_WRITE) && | 41 | if ((filp->f_mode & FMODE_WRITE) && |
38 | (atomic_read(&inode->i_writecount) == 1)) | 42 | (atomic_read(&inode->i_writecount) == 1)) |
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 8dd3d5de5861..80ed6dc9c9d2 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c | |||
@@ -3901,6 +3901,9 @@ void ext4_truncate(struct inode *inode) | |||
3901 | if (!ext4_can_truncate(inode)) | 3901 | if (!ext4_can_truncate(inode)) |
3902 | return; | 3902 | return; |
3903 | 3903 | ||
3904 | if (inode->i_size == 0) | ||
3905 | ei->i_state |= EXT4_STATE_DA_ALLOC_CLOSE; | ||
3906 | |||
3904 | if (EXT4_I(inode)->i_flags & EXT4_EXTENTS_FL) { | 3907 | if (EXT4_I(inode)->i_flags & EXT4_EXTENTS_FL) { |
3905 | ext4_ext_truncate(inode); | 3908 | ext4_ext_truncate(inode); |
3906 | return; | 3909 | return; |