From: Tao Ma <tm@tao.ma>
To: linux-ext4@vger.kernel.org
Cc: tytso@mit.edu, linux-fsdevel@vger.kernel.org,
linux-kernel@vger.kernel.org, adilger@dilger.ca
Subject: [PATCH V2 16/19] ext4: let ext4_delete_entry handle inline data.
Date: Tue, 22 Nov 2011 00:39:54 +0800 [thread overview]
Message-ID: <1321893597-11024-16-git-send-email-tm@tao.ma> (raw)
In-Reply-To: <1321893597-11024-1-git-send-email-tm@tao.ma>
From: Tao Ma <boyu.mt@taobao.com>
Signed-off-by: Tao Ma <boyu.mt@taobao.com>
---
fs/ext4/inline.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
fs/ext4/namei.c | 9 +++++++++
fs/ext4/xattr.h | 11 +++++++++++
3 files changed, 72 insertions(+), 0 deletions(-)
diff --git a/fs/ext4/inline.c b/fs/ext4/inline.c
index c76ae3b..302925e 100644
--- a/fs/ext4/inline.c
+++ b/fs/ext4/inline.c
@@ -1355,6 +1355,58 @@ out_find:
return iloc.bh;
}
+int ext4_delete_inline_entry(handle_t *handle,
+ struct inode *dir,
+ struct ext4_dir_entry_2 *de_del,
+ struct buffer_head *bh)
+{
+ int err, inline_size;
+ struct ext4_iloc iloc;
+ void *inline_start;
+
+ err = ext4_get_inode_loc(dir, &iloc);
+ if (err)
+ return err;
+
+ down_write(&EXT4_I(dir)->xattr_sem);
+ if (!ext4_has_inline_data(dir))
+ goto out;
+
+ if ((void *)de_del - ((void *)ext4_raw_inode(&iloc)->i_block) <
+ EXT4_MIN_INLINE_DATA_SIZE) {
+ inline_start = ext4_raw_inode(&iloc)->i_block;
+ inline_size = EXT4_MIN_INLINE_DATA_SIZE;
+ } else {
+ inline_start = ext4_get_inline_xattr_pos(dir, &iloc);
+ inline_size = ext4_get_inline_size(dir) -
+ EXT4_MIN_INLINE_DATA_SIZE;
+ }
+
+ err = ext4_journal_get_write_access(handle, bh);
+ if (err)
+ goto out;
+
+ err = ext4_generic_delete_entry(handle, dir, de_del, bh,
+ inline_start, inline_size);
+ if (err)
+ goto out;
+
+ BUFFER_TRACE(bh, "call ext4_handle_dirty_metadata");
+ get_bh(iloc.bh);
+ err = ext4_mark_inode_dirty(handle, dir);
+ if (unlikely(err))
+ goto out;
+
+ ext4_show_inline_dir(dir, iloc.bh, inline_start, inline_size);
+ err = 1;
+out:
+ up_write(&EXT4_I(dir)->xattr_sem);
+ brelse(iloc.bh);
+ if (err != 1 && err != -ENOENT)
+ ext4_std_error(dir->i_sb, err);
+ return err;
+}
+
int ext4_destroy_inline_data(handle_t *handle, struct inode *inode)
{
int ret;
diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
index f706b0f..cefcec6 100644
--- a/fs/ext4/namei.c
+++ b/fs/ext4/namei.c
@@ -1741,6 +1741,15 @@ static int ext4_delete_entry(handle_t *handle,
{
int err;
+ if (ext4_has_inline_data(dir)) {
+ err = ext4_delete_inline_entry(handle, dir, de_del, bh);
+ if (err) {
+ if (err == 1)
+ err = 0;
+ return err;
+ }
+ }
+
BUFFER_TRACE(bh, "get_write_access");
err = ext4_journal_get_write_access(handle, bh);
if (unlikely(err))
diff --git a/fs/ext4/xattr.h b/fs/ext4/xattr.h
index f4d4cb1..ccd994e 100644
--- a/fs/ext4/xattr.h
+++ b/fs/ext4/xattr.h
@@ -174,6 +174,10 @@ extern struct buffer_head *ext4_find_inline_entry(struct inode *dir,
const struct qstr *d_name,
struct ext4_dir_entry_2 **res_dir,
int *has_inline_data);
+extern int ext4_delete_inline_entry(handle_t *handle,
+ struct inode *dir,
+ struct ext4_dir_entry_2 *de_del,
+ struct buffer_head *bh);
# else /* CONFIG_EXT4_FS_XATTR */
static inline int
@@ -370,6 +374,13 @@ struct buffer_head *ext4_find_inline_entry(struct inode *dir,
{
return NULL;
}
+static inline int ext4_delete_inline_entry(handle_t *handle,
+ struct inode *dir,
+ struct ext4_dir_entry_2 *de_del,
+ struct buffer_head *bh)
+{
+ return 0;
+}
# endif /* CONFIG_EXT4_FS_XATTR */
#ifdef CONFIG_EXT4_FS_SECURITY
--
1.7.0.4
next prev parent reply other threads:[~2011-11-21 17:05 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-21 16:34 [PATCH V2 00/19] ext4: Add inline data support Tao Ma
2011-11-21 16:39 ` [PATCH V2 01/19] ext4: Move extra inode read to a new function Tao Ma
2011-11-21 16:39 ` [PATCH V2 02/19] ext4: export inline xattr functions Tao Ma
2011-11-21 16:39 ` [PATCH V2 03/19] ext4: Add the basic function for inline data support Tao Ma
2011-11-21 16:39 ` [PATCH V2 04/19] ext4: Add read support for inline data Tao Ma
2011-11-21 16:39 ` [PATCH V2 05/19] ext4: Add normal write " Tao Ma
2011-11-21 16:39 ` [PATCH V2 06/19] ext4: Add journalled " Tao Ma
2011-11-21 16:39 ` [PATCH V2 07/19] ext4: Add delalloc " Tao Ma
2011-11-21 16:39 ` [PATCH V2 08/19] ext4: Create a new function ext4_init_new_dir Tao Ma
2011-11-21 16:39 ` [PATCH V2 09/19] ext4: Refactor __ext4_check_dir_entry to accepts start and size Tao Ma
2011-11-21 16:39 ` [PATCH V2 10/19] ext4: Create __ext4_insert_dentry for dir entry insertion Tao Ma
2011-11-21 16:39 ` [PATCH V2 11/19] ext4: let add_dir_entry handle inline data properly Tao Ma
2011-11-21 16:39 ` [PATCH V2 12/19] ext4: Let ext4_readdir handle inline data Tao Ma
2011-11-21 16:39 ` [PATCH V2 13/19] ext4: Create a new function search_dir Tao Ma
2011-11-21 16:39 ` [PATCH V2 14/19] ext4: let ext4_find_entry handle inline data Tao Ma
2011-11-21 16:39 ` [PATCH V2 15/19] ext4: make ext4_delete_entry generic Tao Ma
2011-11-21 16:39 ` Tao Ma [this message]
2011-11-21 16:39 ` [PATCH V2 17/19] ext4: let empty_dir handle inline dir Tao Ma
2011-11-21 16:39 ` [PATCH V2 18/19] ext4: let ext4_rename " Tao Ma
2011-11-21 16:39 ` [PATCH V2 19/19] 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=1321893597-11024-16-git-send-email-tm@tao.ma \
--to=tm@tao.ma \
--cc=adilger@dilger.ca \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=tytso@mit.edu \
/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
all inboxes | Powered by JetHome®