linux-ext4.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Tao Ma <tm@tao.ma>
To: linux-ext4@vger.kernel.org
Subject: [PATCH V6 19/23] ext4: Let fiemap work with inline data.
Date: Fri, 14 Sep 2012 19:25:07 +0800	[thread overview]
Message-ID: <1347621911-4104-19-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>

fiemap is used to find the disk layout of a file, as for inline data,
let us just pretend like a file with just one extent.

Signed-off-by: Tao Ma <boyu.mt@taobao.com>
---
 fs/ext4/extents.c |    9 +++++++++
 fs/ext4/inline.c  |   35 +++++++++++++++++++++++++++++++++++
 fs/ext4/xattr.h   |   10 ++++++++++
 3 files changed, 54 insertions(+), 0 deletions(-)

diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
index 416f31d..fc52ad9 100644
--- a/fs/ext4/extents.c
+++ b/fs/ext4/extents.c
@@ -4922,6 +4922,15 @@ int ext4_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
 	ext4_lblk_t start_blk;
 	int error = 0;
 
+	if (ext4_has_inline_data(inode)) {
+		int has_inline = 1;
+
+		error = ext4_inline_data_fiemap(inode, fieinfo, &has_inline);
+
+		if (has_inline)
+			return error;
+	}
+
 	/* fallback to generic here if not in extents fmt */
 	if (!(ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS)))
 		return generic_block_fiemap(inode, fieinfo, start, len,
diff --git a/fs/ext4/inline.c b/fs/ext4/inline.c
index e01533f..dcf1f8e 100644
--- a/fs/ext4/inline.c
+++ b/fs/ext4/inline.c
@@ -15,6 +15,7 @@
 #include "ext4.h"
 #include "xattr.h"
 #include "truncate.h"
+#include <linux/fiemap.h>
 
 #define EXT4_XATTR_SYSTEM_DATA	"data"
 #define EXT4_MIN_INLINE_DATA_SIZE	((sizeof(__le32) * EXT4_N_BLOCKS))
@@ -1674,3 +1675,37 @@ int ext4_destroy_inline_data(handle_t *handle, struct inode *inode)
 
 	return ret;
 }
+
+int ext4_inline_data_fiemap(struct inode *inode,
+			    struct fiemap_extent_info *fieinfo,
+			    int *has_inline)
+{
+	__u64 physical = 0;
+	__u64 length;
+	__u32 flags = FIEMAP_EXTENT_DATA_INLINE | FIEMAP_EXTENT_LAST;
+	int error = 0;
+	struct ext4_iloc iloc;
+
+	down_read(&EXT4_I(inode)->xattr_sem);
+	if (!ext4_has_inline_data(inode)) {
+		*has_inline = 0;
+		goto out;
+	}
+
+	error = ext4_get_inode_loc(inode, &iloc);
+	if (error)
+		goto out;
+
+	physical = iloc.bh->b_blocknr << inode->i_sb->s_blocksize_bits;
+	physical += (char *)ext4_raw_inode(&iloc) - iloc.bh->b_data;
+	physical += offsetof(struct ext4_inode, i_block);
+	length = i_size_read(inode);
+
+	if (physical)
+		error = fiemap_fill_next_extent(fieinfo, 0, physical,
+						length, flags);
+	brelse(iloc.bh);
+out:
+	up_read(&EXT4_I(inode)->xattr_sem);
+	return (error < 0 ? error : 0);
+}
diff --git a/fs/ext4/xattr.h b/fs/ext4/xattr.h
index dbc014f..2e09ab2 100644
--- a/fs/ext4/xattr.h
+++ b/fs/ext4/xattr.h
@@ -184,6 +184,9 @@ extern int empty_inline_dir(struct inode *dir, int *has_inline_data);
 extern struct buffer_head *ext4_get_first_inline_block(struct inode *inode,
 					struct ext4_dir_entry_2 **parent_de,
 					int *retval);
+extern int ext4_inline_data_fiemap(struct inode *inode,
+				   struct fiemap_extent_info *fieinfo,
+				   int *has_inline);
 # else  /* CONFIG_EXT4_FS_XATTR */
 
 static inline int
@@ -396,6 +399,13 @@ ext4_get_first_inline_block(struct inode *inode,
 {
 	return NULL;
 }
+
+static inline int ext4_inline_data_fiemap(struct inode *inode,
+					  struct fiemap_extent_info *fieinfo,
+					  int *has_inline)
+{
+	return 0;
+}
 # endif  /* CONFIG_EXT4_FS_XATTR */
 
 #ifdef CONFIG_EXT4_FS_SECURITY
-- 
1.7.1


  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   ` [PATCH V6 15/23] ext4: make ext4_delete_entry generic Tao Ma
2012-09-14 11:25   ` [PATCH V6 16/23] ext4: let ext4_delete_entry handle inline data 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   ` Tao Ma [this message]
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-19-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).