ext4: refactor truncate code

Move common code in ext4_ind_truncate() and ext4_ext_truncate() into
ext4_truncate().  This saves over 60 lines of code.

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

1 files changed, 1 insertions, 59 deletions

diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
index d58365e40df7..cbbe8a4deac6 100644
--- a/fs/ext4/extents.c
+++ b/fs/ext4/extents.c
@@ -4257,48 +4257,13 @@ out3:
         return err ? err : allocated;
 }
 
-void ext4_ext_truncate(struct inode *inode)
+void ext4_ext_truncate(handle_t *handle, struct inode *inode)
 {
-        struct address_space *mapping = inode->i_mapping;
         struct super_block *sb = inode->i_sb;
         ext4_lblk_t last_block;
-        handle_t *handle;
-        loff_t page_len;
         int err = 0;
 
         /*
-         * finish any pending end_io work so we won't run the risk of
-         * converting any truncated blocks to initialized later
-         */
-        ext4_flush_unwritten_io(inode);
-
-        /*
-         * probably first extent we're gonna free will be last in block
-         */
-        err = ext4_writepage_trans_blocks(inode);
-        handle = ext4_journal_start(inode, EXT4_HT_TRUNCATE, err);
-        if (IS_ERR(handle))
-                return;
-
-        if (inode->i_size % PAGE_CACHE_SIZE != 0) {
-                page_len = PAGE_CACHE_SIZE -
-                        (inode->i_size & (PAGE_CACHE_SIZE - 1));
-
-                err = ext4_discard_partial_page_buffers(handle,
-                        mapping, inode->i_size, page_len, 0);
-
-                if (err)
-                        goto out_stop;
-        }
-
-        if (ext4_orphan_add(handle, inode))
-                goto out_stop;
-
-        down_write(&EXT4_I(inode)->i_data_sem);
-
-        ext4_discard_preallocations(inode);
-
-        /*
          * TODO: optimization is possible here.
          * Probably we need not scan at all,
          * because page truncation is enough.
@@ -4313,29 +4278,6 @@ void ext4_ext_truncate(struct inode *inode)
         err = ext4_es_remove_extent(inode, last_block,
                                     EXT_MAX_BLOCKS - last_block);
         err = ext4_ext_remove_space(inode, last_block, EXT_MAX_BLOCKS - 1);
-
-        /* In a multi-transaction truncate, we only make the final
-         * transaction synchronous.
-         */
-        if (IS_SYNC(inode))
-                ext4_handle_sync(handle);
-
-        up_write(&EXT4_I(inode)->i_data_sem);
-
-out_stop:
-        /*
-         * If this was a simple ftruncate() and the file will remain alive,
-         * then we need to clear up the orphan record which we created above.
-         * However, if this was a real unlink then we were called by
-         * ext4_delete_inode(), and we allow that function to clean up the
-         * orphan info for us.
-         */
-        if (inode->i_nlink)
-                ext4_orphan_del(handle, inode);
-
-        inode->i_mtime = inode->i_ctime = ext4_current_time(inode);
-        ext4_mark_inode_dirty(handle, inode);
-        ext4_journal_stop(handle);
 }
 
 static void ext4_falloc_update_inode(struct inode *inode,