From 663d2c001cad1e268371dcda82de46815189e2f2 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Tue, 2 Jun 2009 08:09:24 -0400 Subject: [PATCH] ext4: Automatically allocate delay allocated blocks on rename (cherry picked from commit 8750c6d5fcbd3342b3d908d157f81d345c5325a7) When renaming a file such that a link to another inode is overwritten, force any delay allocated blocks that to be allocated so that if the filesystem is mounted with data=ordered, the data blocks will be pushed out to disk along with the journal commit. Many application programs expect this, so we do this to avoid zero length files if the system crashes unexpectedly. Signed-off-by: "Theodore Ts'o" Signed-off-by: Greg Kroah-Hartman --- fs/ext4/namei.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c index e2028b3b5a81..6a71680c0e26 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c @@ -2314,7 +2314,7 @@ static int ext4_rename (struct inode * old_dir, struct dentry *old_dentry, struct inode * old_inode, * new_inode; struct buffer_head * old_bh, * new_bh, * dir_bh; struct ext4_dir_entry_2 * old_de, * new_de; - int retval; + int retval, force_da_alloc = 0; old_bh = new_bh = dir_bh = NULL; @@ -2452,6 +2452,7 @@ static int ext4_rename (struct inode * old_dir, struct dentry *old_dentry, ext4_mark_inode_dirty(handle, new_inode); if (!new_inode->i_nlink) ext4_orphan_add(handle, new_inode); + force_da_alloc = 1; } retval = 0; @@ -2460,6 +2461,8 @@ end_rename: brelse (old_bh); brelse (new_bh); ext4_journal_stop(handle); + if (retval == 0 && force_da_alloc) + ext4_alloc_da_blocks(old_inode); return retval; } -- 2.47.2