From patchwork Tue Aug 30 09:00:20 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yongqiang Yang X-Patchwork-Id: 112232 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id E711EB6F8F for ; Tue, 30 Aug 2011 19:43:59 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752434Ab1H3Jnu (ORCPT ); Tue, 30 Aug 2011 05:43:50 -0400 Received: from mail-pz0-f42.google.com ([209.85.210.42]:38263 "EHLO mail-pz0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752755Ab1H3Jns (ORCPT ); Tue, 30 Aug 2011 05:43:48 -0400 Received: by mail-pz0-f42.google.com with SMTP id 37so10017235pzk.1 for ; Tue, 30 Aug 2011 02:43:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=fadRoSQKKkYLe77AVd2TRHx/wScZWYXrpVmVQE99Qxg=; b=d2fPFSNVc1TIpASACRSn6clP3aeyESZs9K7WiH4gTWRKlQwbK7I7fMClDDNW1+EoWk m1WuVHo74tpOupMXLS7SKeo/RFDVg8mggBXZtHSXpp1Y3q9FfiGaUtuLSA2FruoYbdii RZiOw668SSBZo4lG9F0UzDuEt0MB3yG/KP4+s= Received: by 10.142.158.3 with SMTP id g3mr3039446wfe.127.1314697428365; Tue, 30 Aug 2011 02:43:48 -0700 (PDT) Received: from localhost.localdomain ([159.226.43.42]) by mx.google.com with ESMTPS id u2sm23130416pbq.9.2011.08.30.02.43.45 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 30 Aug 2011 02:43:47 -0700 (PDT) From: Yongqiang Yang To: linux-ext4@vger.kernel.org Cc: achender@linux.vnet.ibm.com, adityakali@google.com, tytso@mit.edu, Yongqiang Yang Subject: [RFC PATCH 4/5] ext4: let ext4 maintian delayed extent lists Date: Tue, 30 Aug 2011 17:00:20 +0800 Message-Id: <1314694821-17213-5-git-send-email-xiaoqiangnk@gmail.com> X-Mailer: git-send-email 1.7.5.1 In-Reply-To: <1314694821-17213-1-git-send-email-xiaoqiangnk@gmail.com> References: <1314694821-17213-1-git-send-email-xiaoqiangnk@gmail.com> Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org This patch let ext4 maintain delayed extent lists. Signed-off-by: Yongqiang Yang --- fs/ext4/ext4.h | 1 + fs/ext4/extents.c | 2 ++ fs/ext4/indirect.c | 3 +++ fs/ext4/inode.c | 28 ++++++++++++++++++++++++++-- fs/ext4/super.c | 12 +++++++++++- 5 files changed, 43 insertions(+), 3 deletions(-) diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index 6c5bfd6..c16b6e9 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h @@ -518,6 +518,7 @@ struct ext4_new_group_data { #define EXT4_GET_BLOCKS_PUNCH_OUT_EXT 0x0020 /* Don't normalize allocation size (used for fallocate) */ #define EXT4_GET_BLOCKS_NO_NORMALIZE 0x0040 +#define EXT4_GET_BLOCKS_DEALLOC 0x0080 /* * Flags used by ext4_free_blocks diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c index 475ddf5..c9ad622 100644 --- a/fs/ext4/extents.c +++ b/fs/ext4/extents.c @@ -3688,6 +3688,8 @@ void ext4_ext_truncate(struct inode *inode) last_block = (inode->i_size + sb->s_blocksize - 1) >> EXT4_BLOCK_SIZE_BITS(sb); + err = ext4_de_remove_space(inode, last_block, + EXT_MAX_BLOCKS - last_block); err = ext4_ext_remove_space(inode, last_block); /* In a multi-transaction truncate, we only make the final diff --git a/fs/ext4/indirect.c b/fs/ext4/indirect.c index 0962642..25cdb5b 100644 --- a/fs/ext4/indirect.c +++ b/fs/ext4/indirect.c @@ -22,6 +22,7 @@ #include #include "ext4_jbd2.h" +#include "ext4_extents.h" #include "truncate.h" #include @@ -1383,6 +1384,8 @@ void ext4_ind_truncate(struct inode *inode) down_write(&ei->i_data_sem); ext4_discard_preallocations(inode); + ext4_de_remove_space(inode, last_block, + EXT_MAX_BLOCKS - last_block); /* * The orphan list entry will now protect us from any crash which diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index c3ce754..bcf5257 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -445,7 +445,15 @@ int ext4_map_blocks(handle_t *handle, struct inode *inode, up_read((&EXT4_I(inode)->i_data_sem)); if (retval > 0 && map->m_flags & EXT4_MAP_MAPPED) { - int ret = check_block_validity(inode, map); + int ret; + if (flags & EXT4_GET_BLOCKS_DELALLOC_RESERVE) { + /* delayed alloc may be allocated by fallocate, + * we need to handle delayed extent here. + */ + down_write((&EXT4_I(inode)->i_data_sem)); + goto delayed_mapped; + } + ret = check_block_validity(inode, map); if (ret != 0) return ret; } @@ -520,8 +528,18 @@ int ext4_map_blocks(handle_t *handle, struct inode *inode, (flags & EXT4_GET_BLOCKS_DELALLOC_RESERVE)) ext4_da_update_reserve_space(inode, retval, 1); } - if (flags & EXT4_GET_BLOCKS_DELALLOC_RESERVE) + if (flags & EXT4_GET_BLOCKS_DELALLOC_RESERVE) { ext4_clear_inode_state(inode, EXT4_STATE_DELALLOC_RESERVED); +delayed_mapped: + if (retval > 0 && map->m_flags & EXT4_MAP_MAPPED) { + int ret; + /* delayed allocation blocks has been allocated */ + ret = ext4_de_remove_space(inode, map->m_lblk, + map->m_len); + if (ret < 0) + retval = ret; + } + } up_write((&EXT4_I(inode)->i_data_sem)); if (retval > 0 && map->m_flags & EXT4_MAP_MAPPED) { @@ -1633,6 +1651,12 @@ static int ext4_da_get_block_prep(struct inode *inode, sector_t iblock, /* not enough space to reserve */ return ret; + down_write((&EXT4_I(inode)->i_data_sem)); + ret = ext4_de_add_space(inode, map.m_lblk, map.m_len); + up_write((&EXT4_I(inode)->i_data_sem)); + if (ret) + return ret; + map_bh(bh, inode->i_sb, invalid_block); set_buffer_new(bh); set_buffer_delay(bh); diff --git a/fs/ext4/super.c b/fs/ext4/super.c index f0b6fe6..e607823 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -49,6 +49,7 @@ #include "xattr.h" #include "acl.h" #include "mballoc.h" +#include "ext4_extents.h" #define CREATE_TRACE_POINTS #include @@ -968,6 +969,7 @@ void ext4_clear_inode(struct inode *inode) end_writeback(inode); dquot_drop(inode); ext4_discard_preallocations(inode); + ext4_de_remove_space(inode, 0, EXT_MAX_BLOCKS); if (EXT4_I(inode)->jinode) { jbd2_journal_release_jbd_inode(EXT4_JOURNAL(inode), EXT4_I(inode)->jinode); @@ -4985,9 +4987,14 @@ static int __init ext4_init_fs(void) init_waitqueue_head(&ext4__ioend_wq[i]); } - err = ext4_init_pageio(); + err = ext4_init_de(); if (err) return err; + + err = ext4_init_pageio(); + if (err) + goto out8; + err = ext4_init_system_zone(); if (err) goto out7; @@ -5039,6 +5046,9 @@ out6: ext4_exit_system_zone(); out7: ext4_exit_pageio(); +out8: + ext4_exit_de(); + return err; }