Skip to contentSkip to conversation

ext4: implement ext4_fiemap

PATCH In review Mark Fasheh 3 participants 3 messages May 25, 2008

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 4/5 ext4: implement ext4_fiemap

From: Eric Sandeen <[email protected]>

Hook ext4 to the vfs fiemap interface.

---
 fs/ext4/ext4.h         |    2 +
 fs/ext4/ext4_extents.h |    2 +-
 fs/ext4/extents.c      |  120 +++++++++++++++++++++++++++++++++++++++++++++++-
 fs/ext4/file.c         |    4 ++
 4 files changed, 126 insertions(+), 2 deletions(-)
fs/ext4/ext4.h +2 -0
index 8158083..55f7ca1 100644
@@ -383,6 +383,8 @@ struct ext4_inode {
 	__le32  i_version_hi;	/* high 32 bits for 64-bit version */
 };
 
+#define EXT4_FIEMAP_FLAG_INCOMPAT_UNSUPP (FIEMAP_FLAG_INCOMPAT &	\
+					  ~(FIEMAP_FLAG_LUN_OFFSET))
 
 #define EXT4_EPOCH_BITS 2
 #define EXT4_EPOCH_MASK ((1 << EXT4_EPOCH_BITS) - 1)
fs/ext4/ext4_extents.h +1 -1
index 20906b7..c9fabb0 100644
@@ -132,7 +132,7 @@ struct ext4_ext_path {
  */
 typedef int (*ext_prepare_callback)(struct inode *, struct ext4_ext_path *,
 					struct ext4_ext_cache *,
-					void *);
+					struct ext4_extent *, void *);
 
 #define EXT_CONTINUE   0
 #define EXT_BREAK      1
fs/ext4/extents.c +119 -1

139 lines not on this page · raw message

fs/ext4/file.c +4 -0
index 4159be6..99bde24 100644
@@ -123,6 +123,9 @@ force_commit:
 	return ret;
 }
 
+extern int ext4_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
+		__u64 start, __u64 len);
+
 const struct file_operations ext4_file_operations = {
 	.llseek		= generic_file_llseek,
 	.read		= do_sync_read,
@@ -152,5 +155,6 @@ const struct inode_operations ext4_file_inode_operations = {
 #endif
 	.permission	= ext4_permission,
 	.fallocate	= ext4_fallocate,
+	.fiemap		= ext4_fiemap,
 };
 
Signature · 1 line
1.5.4.1
#1 lore raw

fs/ext4/ext4.h struct ext4_inode { · line 387

Quoted 2 lines · Mark Fasheh
fs/ext4/ext4.h +2 -0
+#define EXT4_FIEMAP_FLAG_INCOMPAT_UNSUPP (FIEMAP_FLAG_INCOMPAT &	\
+					  ~(FIEMAP_FLAG_LUN_OFFSET))

Per discussion with Eric, this needs to be changed:

#define EXT4_FIEMAP_FLAG_SUPP (FIEMAP_FLAG_NUM_EXTENTS | FIEMAP_FLAG_SYNC | \
FIEMAP_FLAG_HSM_READ | FIEMAP_FLAG_LUN_ORDER)

fs/ext4/extents.c retry: · line 3062

Quoted 6 lines
fs/ext4/extents.c +6 -0
+struct fiemap_internal {
+	struct fiemap		*fiemap_s;
+	struct fiemap_extent	fm_extent;
+	char			*cur_ext_ptr;
+	int			err;
+};

This is no longer used and can be removed (now uses fiemap_extent_info).

fs/ext4/extents.c retry: · line 3112

Quoted 12 lines
fs/ext4/extents.c +12 -0
+/*
+ * Callback function called for each extent to gather FIEMAP information.
+ */
+int ext4_ext_fiemap_cb(struct inode *inode, struct ext4_ext_path *path,
+		       struct ext4_ext_cache *newex, struct ext4_extent *ex,
+		       void *data)
+{
+	/* Just counting extents? */
+	if (fieinfo->fi_flags & FIEMAP_FLAG_NUM_EXTENTS) {
+		fieinfo->fi_extents_mapped++;
+		return EXT_CONTINUE;
+	}

This isn't needed anymore, fiemap_fill_next_extent() handles it.

fs/ext4/extents.c retry: · line 3149

Quoted 7 lines
fs/ext4/extents.c +7 -0
+int ext4_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
+		__u64 start, __u64 len)
+{
+	/* fallback to generic here if not extents */
+#warning fix bitmap fallback
+	if (!(EXT4_I(inode)->i_flags & EXT4_EXTENTS_FL))
+		return -EOPNOTSUPP;
	if (!(EXT4_I(inode)->i_flags & EXT4_EXTENTS_FL))
		return generic_block_fiemap(inode, fieinfo, start, len,
					    ext4_get_block);

fs/ext4/extents.c retry: · line 3155

Quoted 5 lines
fs/ext4/extents.c +5 -0
+#if 0
+	/* bail on unsupported flags for this fs */
+	if (fiemap_s->fm_flags & EXT4_FIEMAP_FLAG_INCOMPAT_UNSUPP)
+		return -EOPNOTSUPP;
+#endif

This should be reinstated now that we have come to a decision on the flags:

	if (fieinfo->fi_flags & ~EXT4_FIEMAP_FLAG_SUPP) {
		fieinfo->fi_flags &= ~EXT4_FIEMAP_FLAG_SUPP;
		return -EBADF;
	}

Cheers, Andreas
--
Andreas Dilger
Sr. Staff Engineer, Lustre Group
Sun Microsystems of Canada, Inc.

#2 lore raw
Quoted 9 lines · Andreas Dilger

fs/ext4/ext4.h struct ext4_inode { · line 387

Quoted 2 lines · Mark Fasheh
fs/ext4/ext4.h +2 -0
+#define EXT4_FIEMAP_FLAG_INCOMPAT_UNSUPP (FIEMAP_FLAG_INCOMPAT &	\
+					  ~(FIEMAP_FLAG_LUN_OFFSET))

Per discussion with Eric, this needs to be changed:

#define EXT4_FIEMAP_FLAG_SUPP (FIEMAP_FLAG_NUM_EXTENTS | FIEMAP_FLAG_SYNC | \
FIEMAP_FLAG_HSM_READ | FIEMAP_FLAG_LUN_ORDER)

Yep, I agree with this and the others, probably should have put "proof of concept" in the original message; I knew it had warts but didn't want to hold up Mark's RFE.

Thanks Andreas,

-Eric

Quoted 57 lines

fs/ext4/extents.c retry: · line 3062

Quoted 6 lines
fs/ext4/extents.c +6 -0
+struct fiemap_internal {
+	struct fiemap		*fiemap_s;
+	struct fiemap_extent	fm_extent;
+	char			*cur_ext_ptr;
+	int			err;
+};

This is no longer used and can be removed (now uses fiemap_extent_info).

fs/ext4/extents.c retry: · line 3112

Quoted 12 lines
fs/ext4/extents.c +12 -0
+/*
+ * Callback function called for each extent to gather FIEMAP information.
+ */
+int ext4_ext_fiemap_cb(struct inode *inode, struct ext4_ext_path *path,
+		       struct ext4_ext_cache *newex, struct ext4_extent *ex,
+		       void *data)
+{
+	/* Just counting extents? */
+	if (fieinfo->fi_flags & FIEMAP_FLAG_NUM_EXTENTS) {
+		fieinfo->fi_extents_mapped++;
+		return EXT_CONTINUE;
+	}

This isn't needed anymore, fiemap_fill_next_extent() handles it.

fs/ext4/extents.c retry: · line 3149

Quoted 7 lines
fs/ext4/extents.c +7 -0
+int ext4_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
+		__u64 start, __u64 len)
+{
+	/* fallback to generic here if not extents */
+#warning fix bitmap fallback
+	if (!(EXT4_I(inode)->i_flags & EXT4_EXTENTS_FL))
+		return -EOPNOTSUPP;
	if (!(EXT4_I(inode)->i_flags & EXT4_EXTENTS_FL))
		return generic_block_fiemap(inode, fieinfo, start, len,
					    ext4_get_block);

fs/ext4/extents.c retry: · line 3155

Quoted 5 lines
fs/ext4/extents.c +5 -0
+#if 0
+	/* bail on unsupported flags for this fs */
+	if (fiemap_s->fm_flags & EXT4_FIEMAP_FLAG_INCOMPAT_UNSUPP)
+		return -EOPNOTSUPP;
+#endif

This should be reinstated now that we have come to a decision on the flags:

	if (fieinfo->fi_flags & ~EXT4_FIEMAP_FLAG_SUPP) {
		fieinfo->fi_flags &= ~EXT4_FIEMAP_FLAG_SUPP;
		return -EBADF;
	}

Cheers, Andreas
--
Andreas Dilger
Sr. Staff Engineer, Lustre Group
Sun Microsystems of Canada, Inc.