From: Tao Ma <tm@tao.ma>
To: linux-ext4@vger.kernel.org
Subject: [PATCH V6 15/23] ext4: make ext4_delete_entry generic.
Date: Fri, 14 Sep 2012 19:25:03 +0800 [thread overview]
Message-ID: <1347621911-4104-15-git-send-email-tm@tao.ma> (raw)
In-Reply-To: <1347621911-4104-1-git-send-email-tm@tao.ma>
From: Tao Ma <boyu.mt@taobao.com>
Currently ext4_delete_entry is used only for dir entry
removing from a dir block. So let us create a new function
ext4_generic_delete_entry and this function takes a entry_buf
and a buf_size so that it can be used for inline data.
Signed-off-by: Tao Ma <boyu.mt@taobao.com>
---
fs/ext4/ext4.h | 7 +++++
fs/ext4/namei.c | 72 +++++++++++++++++++++++++++++++++++--------------------
2 files changed, 53 insertions(+), 26 deletions(-)
diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
index c91116c..1ffe00a 100644
--- a/fs/ext4/ext4.h
+++ b/fs/ext4/ext4.h
@@ -2095,6 +2095,13 @@ extern int search_dir(struct buffer_head *bh,
const struct qstr *d_name,
unsigned int offset,
struct ext4_dir_entry_2 **res_dir);
+extern int ext4_generic_delete_entry(handle_t *handle,
+ struct inode *dir,
+ struct ext4_dir_entry_2 *de_del,
+ struct buffer_head *bh,
+ void *entry_buf,
+ int buf_size,
+ int csum_size);
/* resize.c */
extern int ext4_group_add(struct super_block *sb,
diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
index edcfee4..371c1a2 100644
--- a/fs/ext4/namei.c
+++ b/fs/ext4/namei.c
@@ -2037,37 +2037,29 @@ cleanup:
}
/*
- * ext4_delete_entry deletes a directory entry by merging it with the
- * previous entry
+ * ext4_generic_delete_entry deletes a directory entry by merging it
+ * with the previous entry
*/
-static int ext4_delete_entry(handle_t *handle,
- struct inode *dir,
- struct ext4_dir_entry_2 *de_del,
- struct buffer_head *bh)
+int ext4_generic_delete_entry(handle_t *handle,
+ struct inode *dir,
+ struct ext4_dir_entry_2 *de_del,
+ struct buffer_head *bh,
+ void *entry_buf,
+ int buf_size,
+ int csum_size)
{
struct ext4_dir_entry_2 *de, *pde;
unsigned int blocksize = dir->i_sb->s_blocksize;
- int csum_size = 0;
- int i, err;
-
- if (EXT4_HAS_RO_COMPAT_FEATURE(dir->i_sb,
- EXT4_FEATURE_RO_COMPAT_METADATA_CSUM))
- csum_size = sizeof(struct ext4_dir_entry_tail);
+ int i;
i = 0;
pde = NULL;
- de = (struct ext4_dir_entry_2 *) bh->b_data;
- while (i < bh->b_size - csum_size) {
+ de = (struct ext4_dir_entry_2 *)entry_buf;
+ while (i < buf_size - csum_size) {
if (ext4_check_dir_entry(dir, NULL, de, bh,
bh->b_data, bh->b_size, i))
return -EIO;
if (de == de_del) {
- BUFFER_TRACE(bh, "get_write_access");
- err = ext4_journal_get_write_access(handle, bh);
- if (unlikely(err)) {
- ext4_std_error(dir->i_sb, err);
- return err;
- }
if (pde)
pde->rec_len = ext4_rec_len_to_disk(
ext4_rec_len_from_disk(pde->rec_len,
@@ -2078,12 +2070,6 @@ static int ext4_delete_entry(handle_t *handle,
else
de->inode = 0;
dir->i_version++;
- BUFFER_TRACE(bh, "call ext4_handle_dirty_metadata");
- err = ext4_handle_dirty_dirent_node(handle, dir, bh);
- if (unlikely(err)) {
- ext4_std_error(dir->i_sb, err);
- return err;
- }
return 0;
}
i += ext4_rec_len_from_disk(de->rec_len, blocksize);
@@ -2093,6 +2079,40 @@ static int ext4_delete_entry(handle_t *handle,
return -ENOENT;
}
+static int ext4_delete_entry(handle_t *handle,
+ struct inode *dir,
+ struct ext4_dir_entry_2 *de_del,
+ struct buffer_head *bh)
+{
+ int err, csum_size = 0;
+
+ if (EXT4_HAS_RO_COMPAT_FEATURE(dir->i_sb,
+ EXT4_FEATURE_RO_COMPAT_METADATA_CSUM))
+ csum_size = sizeof(struct ext4_dir_entry_tail);
+
+ BUFFER_TRACE(bh, "get_write_access");
+ err = ext4_journal_get_write_access(handle, bh);
+ if (unlikely(err))
+ goto out;
+
+ err = ext4_generic_delete_entry(handle, dir, de_del,
+ bh, bh->b_data,
+ dir->i_sb->s_blocksize, csum_size);
+ if (err)
+ goto out;
+
+ BUFFER_TRACE(bh, "call ext4_handle_dirty_metadata");
+ err = ext4_handle_dirty_dirent_node(handle, dir, bh);
+ if (unlikely(err))
+ goto out;
+
+ return 0;
+out:
+ if (err != -ENOENT)
+ ext4_std_error(dir->i_sb, err);
+ return err;
+}
+
/*
* DIR_NLINK feature is set if 1) nlinks > EXT4_LINK_MAX or 2) nlinks == 2,
* since this indicates that nlinks count was previously 1.
--
1.7.1
next prev parent reply other threads:[~2012-09-14 11:34 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-14 11:18 [PATCH V6 00/23] ext4: Add inline data support Tao Ma
2012-09-14 11:24 ` [PATCH V6 01/23] ext4: Move extra inode read to a new function Tao Ma
2012-09-14 11:24 ` [PATCH V6 02/23] ext4: export inline xattr functions Tao Ma
2012-09-14 11:24 ` [PATCH V6 03/23] ext4: Add the basic function for inline data support Tao Ma
2012-09-14 11:24 ` [PATCH V6 04/23] ext4: Add read support for inline data Tao Ma
2012-09-14 11:24 ` [PATCH V6 05/23] ext4: Add normal write " Tao Ma
2012-09-14 11:24 ` [PATCH V6 06/23] ext4: Add journalled " Tao Ma
2012-09-14 11:24 ` [PATCH V6 07/23] ext4: Add delalloc " Tao Ma
2012-09-14 11:24 ` [PATCH V6 08/23] ext4: Make ext4_init_dot_dotdot for inline dir usage Tao Ma
2012-09-14 11:24 ` [PATCH V6 09/23] ext4: Refactor __ext4_check_dir_entry to accepts start and size Tao Ma
2012-09-14 11:24 ` [PATCH V6 10/23] ext4: Create __ext4_insert_dentry for dir entry insertion Tao Ma
2012-09-14 11:24 ` [PATCH V6 11/23] ext4: let add_dir_entry handle inline data properly Tao Ma
2012-09-14 11:25 ` [PATCH V6 12/23] ext4: Let ext4_readdir handle inline data Tao Ma
2012-09-14 11:25 ` [PATCH V6 13/23] ext4: Create a new function search_dir Tao Ma
2012-09-14 11:25 ` [PATCH V6 14/23] ext4: let ext4_find_entry handle inline data Tao Ma
2012-09-14 11:25 ` Tao Ma [this message]
2012-09-14 11:25 ` [PATCH V6 16/23] ext4: let ext4_delete_entry " Tao Ma
2012-09-14 11:25 ` [PATCH V6 17/23] ext4: let empty_dir handle inline dir Tao Ma
2012-09-14 11:25 ` [PATCH V6 18/23] ext4: let ext4_rename " Tao Ma
2012-09-14 11:25 ` [PATCH V6 19/23] ext4: Let fiemap work with inline data Tao Ma
2012-09-14 11:25 ` [PATCH V6 20/23] ext4: Evict inline data out if we needs to strore xattr in inode Tao Ma
2012-09-14 11:25 ` [PATCH V6 21/23] ext4: let ext4_truncate handle inline data correctly Tao Ma
2012-09-14 11:25 ` [PATCH V6 22/23] ext4: let fallocate " Tao Ma
2012-09-14 11:25 ` [PATCH V6 23/23] ext4: Enable ext4 inline support Tao Ma
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=1347621911-4104-15-git-send-email-tm@tao.ma \
--to=tm@tao.ma \
--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).