From: Yongqiang Yang <xiaoqiangnk@gmail.com>
To: linux-ext4@vger.kernel.org
Cc: achender@linux.vnet.ibm.com, cmm@us.ibm.com,
Yongqiang Yang <xiaoqiangnk@gmail.com>
Subject: [PATCH RFC v1 5/5] ext4: optimize ext4_ext_convert_to_initialized().
Date: Sat, 23 Apr 2011 01:44:19 -0700 [thread overview]
Message-ID: <1303548259-28311-6-git-send-email-xiaoqiangnk@gmail.com> (raw)
In-Reply-To: <1303548259-28311-1-git-send-email-xiaoqiangnk@gmail.com>
1] Rename ext4_ext_zroout() to ext4_ext_zeroout_dev().
2] Optimize ext4_ext_convert_to_initialized() by using
ext4_ext_zeroout_mem().
Signed-off-by: Yongqiang Yang <xiaoqiangnk@gmail.com>
---
fs/ext4/extents.c | 32 ++++++++++++++++++++++++--------
1 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
index 30663b6..0fc4ca1 100644
--- a/fs/ext4/extents.c
+++ b/fs/ext4/extents.c
@@ -2538,7 +2538,7 @@ void ext4_ext_release(struct super_block *sb)
}
/* FIXME!! we need to try to merge to left or right after zero-out */
-static int ext4_ext_zeroout(struct inode *inode, struct ext4_extent *ex)
+static int ext4_ext_zeroout_dev(struct inode *inode, struct ext4_extent *ex)
{
ext4_fsblk_t ee_pblock;
unsigned int ee_len;
@@ -2597,7 +2597,7 @@ static int ext4_ext_zeroout_mem(struct inode *inode,
ext.ee_block = cpu_to_le32(lblk);
ext.ee_len = cpu_to_le16(end - lblk);
ext4_ext_store_pblock(&ext, pblk);
- return ext4_ext_zeroout(inode, &ext);
+ return ext4_ext_zeroout_dev(inode, &ext);
}
/* map buffers, mark dirty */
@@ -2725,7 +2725,7 @@ static int ext4_split_extent_at(handle_t *handle,
err = ext4_ext_insert_extent(handle, inode, path, &newex, flags);
if (err == -ENOSPC && (EXT4_EXT_MAY_ZEROOUT & split_flag)) {
- err = ext4_ext_zeroout(inode, &orig_ex);
+ err = ext4_ext_zeroout_dev(inode, &orig_ex);
if (err)
goto fix_extent_len;
/* update the extent length and mark as initialized */
@@ -2860,9 +2860,25 @@ static int ext4_ext_convert_to_initialized(handle_t *handle,
/* If extent has less than 2*EXT4_EXT_ZERO_LEN zerout directly */
if (ee_len <= 2*EXT4_EXT_ZERO_LEN &&
(EXT4_EXT_MAY_ZEROOUT & split_flag)) {
- err = ext4_ext_zeroout(inode, ex);
- if (err)
- goto out;
+ if (map->m_lblk > ee_block) {
+ zero_ex.ee_block = ex->ee_block;
+ zero_ex.ee_len = cpu_to_le16(map->m_lblk - ee_block);
+ ext4_ext_store_pblock(&zero_ex, ext4_ext_pblock(ex));
+ err = ext4_ext_zeroout_mem(inode, &zero_ex);
+ if (err)
+ goto out;
+ }
+
+ if (map->m_lblk + map->m_len < ee_block + ee_len) {
+ zero_ex.ee_block = cpu_to_le32(map->m_lblk +
+ map->m_len);
+ zero_ex.ee_len = cpu_to_le16(allocated - map->m_len);
+ ext4_ext_store_pblock(&zero_ex, ext4_ext_pblock(ex) +
+ (map->m_lblk - ee_block) + map->m_len);
+ err = ext4_ext_zeroout_mem(inode, &zero_ex);
+ if (err)
+ goto out;
+ }
err = ext4_ext_get_access(handle, inode, path + depth);
if (err)
@@ -2892,7 +2908,7 @@ static int ext4_ext_convert_to_initialized(handle_t *handle,
zero_ex.ee_len = cpu_to_le16(allocated - map->m_len);
ext4_ext_store_pblock(&zero_ex,
ext4_ext_pblock(ex) + map->m_lblk - ee_block);
- err = ext4_ext_zeroout(inode, &zero_ex);
+ err = ext4_ext_zeroout_mem(inode, &zero_ex);
if (err)
goto out;
split_map.m_lblk = map->m_lblk;
@@ -2907,7 +2923,7 @@ static int ext4_ext_convert_to_initialized(handle_t *handle,
ee_block);
ext4_ext_store_pblock(&zero_ex,
ext4_ext_pblock(ex));
- err = ext4_ext_zeroout(inode, &zero_ex);
+ err = ext4_ext_zeroout_mem(inode, &zero_ex);
if (err)
goto out;
}
--
1.7.4.4
next prev parent reply other threads:[~2011-04-23 8:47 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-23 8:44 [PATCH RFC v1 0/5]Factor common code from convert and split unwritten Yongqiang Yang
2011-04-23 8:44 ` [PATCH RFC v1 1/5] ext4:Add a function merging extent right and left Yongqiang Yang
2011-04-23 8:44 ` [PATCH RFC v1 2/5] ext4:Add two functions splitting an extent Yongqiang Yang
2011-04-23 8:44 ` [PATCH RFC v1 3/5] ext4:Reimplement convert and split_unwritten Yongqiang Yang
2011-04-23 8:44 ` [PATCH RFC v1 4/5] ext4: Add a function ext4_ext_zeroout_mem() Yongqiang Yang
2011-04-23 8:44 ` Yongqiang Yang [this message]
2011-04-26 19:08 ` [PATCH RFC v1 0/5]Factor common code from convert and split unwritten Allison Henderson
2011-04-27 1:14 ` Yongqiang Yang
2011-04-27 4:48 ` Yongqiang Yang
2011-04-27 6:34 ` Allison Henderson
2011-04-27 7:19 ` Yongqiang Yang
2011-04-28 6:05 ` Yongqiang Yang
2011-04-28 19:51 ` Allison Henderson
2011-04-29 19:16 ` Allison Henderson
2011-04-29 19:42 ` Yongqiang Yang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1303548259-28311-6-git-send-email-xiaoqiangnk@gmail.com \
--to=xiaoqiangnk@gmail.com \
--cc=achender@linux.vnet.ibm.com \
--cc=cmm@us.ibm.com \
--cc=linux-ext4@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).