From: Tao Ma <tm@tao.ma>
To: linux-ext4@vger.kernel.org
Cc: linux-fsdevel@vger.kernel.org
Subject: [PATCH V4 01/22] ext4: Move extra inode read to a new function.
Date: Mon, 20 Feb 2012 15:01:35 +0800 [thread overview]
Message-ID: <1329721316-4955-1-git-send-email-tm@tao.ma> (raw)
In-Reply-To: <4F41EF95.2000909@tao.ma>
From: Tao Ma <boyu.mt@taobao.com>
Currently, in ext4_iget we do a simple check to see whether
there does exist some information starting from the end
of i_extra_size. With inline data added, this procedure
is more complicated. So move it to a new function named
ext4_iget_extra_inode.
Signed-off-by: Tao Ma <boyu.mt@taobao.com>
---
fs/ext4/inode.c | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index feaa82f..0b2d6c1 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -3610,6 +3610,16 @@ static blkcnt_t ext4_inode_blocks(struct ext4_inode *raw_inode,
}
}
+static inline void ext4_iget_extra_inode(struct inode *inode,
+ struct ext4_inode *raw_inode,
+ struct ext4_inode_info *ei)
+{
+ __le32 *magic = (void *)raw_inode +
+ EXT4_GOOD_OLD_INODE_SIZE + ei->i_extra_isize;
+ if (*magic == cpu_to_le32(EXT4_XATTR_MAGIC))
+ ext4_set_inode_state(inode, EXT4_STATE_XATTR);
+}
+
struct inode *ext4_iget(struct super_block *sb, unsigned long ino)
{
struct ext4_iloc iloc;
@@ -3720,13 +3730,8 @@ struct inode *ext4_iget(struct super_block *sb, unsigned long ino)
/* The extra space is currently unused. Use it. */
ei->i_extra_isize = sizeof(struct ext4_inode) -
EXT4_GOOD_OLD_INODE_SIZE;
- } else {
- __le32 *magic = (void *)raw_inode +
- EXT4_GOOD_OLD_INODE_SIZE +
- ei->i_extra_isize;
- if (*magic == cpu_to_le32(EXT4_XATTR_MAGIC))
- ext4_set_inode_state(inode, EXT4_STATE_XATTR);
- }
+ } else
+ ext4_iget_extra_inode(inode, raw_inode, ei);
} else
ei->i_extra_isize = 0;
--
1.7.0.4
next prev parent reply other threads:[~2012-02-20 7:01 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-20 7:00 [PATCH V4 00/22] ext4: Add inline data support Tao Ma
2012-02-20 7:01 ` Tao Ma [this message]
2012-02-20 7:01 ` [PATCH V4 02/22] ext4: export inline xattr functions Tao Ma
2012-02-21 22:45 ` Andreas Dilger
2012-02-20 7:01 ` [PATCH V4 03/22] ext4: Add the basic function for inline data support Tao Ma
2012-04-07 0:21 ` Andreas Dilger
2012-04-13 2:59 ` Tao Ma
2012-02-20 7:01 ` [PATCH V4 04/22] ext4: Add read support for inline data Tao Ma
2012-02-20 7:01 ` [PATCH V4 05/22] ext4: Add normal write " Tao Ma
2012-02-20 7:01 ` [PATCH V4 06/22] ext4: Add journalled " Tao Ma
2012-02-20 7:01 ` [PATCH V4 07/22] ext4: Add delalloc " Tao Ma
2012-02-20 7:01 ` [PATCH V4 08/22] ext4: Create a new function ext4_init_new_dir Tao Ma
2012-02-20 7:01 ` [PATCH V4 09/22] ext4: Refactor __ext4_check_dir_entry to accepts start and size Tao Ma
2012-02-20 7:01 ` [PATCH V4 10/22] ext4: Create __ext4_insert_dentry for dir entry insertion Tao Ma
2012-02-20 7:01 ` [PATCH V4 11/22] ext4: let add_dir_entry handle inline data properly Tao Ma
2012-02-20 7:01 ` [PATCH V4 12/22] ext4: Let ext4_readdir handle inline data Tao Ma
2012-02-20 7:01 ` [PATCH V4 13/22] ext4: Create a new function search_dir Tao Ma
2012-02-20 7:01 ` [PATCH V4 14/22] ext4: let ext4_find_entry handle inline data Tao Ma
2012-02-20 7:01 ` [PATCH V4 15/22] ext4: make ext4_delete_entry generic Tao Ma
2012-02-20 7:01 ` [PATCH V4 16/22] ext4: let ext4_delete_entry handle inline data Tao Ma
2012-02-20 7:01 ` [PATCH V4 17/22] ext4: let empty_dir handle inline dir Tao Ma
2012-04-07 0:21 ` Andreas Dilger
2012-04-17 3:55 ` Tao Ma
2012-02-20 7:01 ` [PATCH V4 18/22] ext4: let ext4_rename " Tao Ma
2012-02-20 7:01 ` [PATCH V4 19/22] ext4: Let fiemap work with inline data Tao Ma
2012-02-20 7:01 ` [PATCH V4 20/22] ext4: Evict inline data out if we needs to strore xattr in inode Tao Ma
2012-02-20 7:01 ` [PATCH V4 21/22] ext4: let ext4_truncate handle inline data correctly Tao Ma
2012-02-20 7:01 ` [PATCH V4 22/22] ext4: Enable ext4 inline support Tao Ma
2012-02-21 6:51 ` [PATCH V4 01/22] ext4: Move extra inode read to a new function Andreas Dilger
2012-02-21 8:13 ` Tao Ma
2012-02-21 23:44 ` [PATCH V4 00/22] ext4: Add inline data support Andreas Dilger
2012-02-22 1:34 ` 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=1329721316-4955-1-git-send-email-tm@tao.ma \
--to=tm@tao.ma \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-fsdevel@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).