Skip to contentSkip to conversation

ocfs2: fix the end cluster offset of FIEMAP

PATCH RESEND New Jeff Liu 1 participant 1 message Aug 29, 2013 OCFS2

lore
Share & tools
lore

Jeff Liu

author
#0 lore raw

PATCH RESEND 1/1 ocfs2: fix the end cluster offset of FIEMAP

From: Jie Liu <[email protected]>

Call fiemap ioctl(2) with given start offset as well as an desired mapping range should show extents if possible. However, we somehow figure out the end offset of mapping via 'mapping_end -= cpos' before iterating the extent records which would cause problems if the given fiemap length is too small to a cluster size, e.g,

Cluster size 4096:
debugfs.ocfs2 1.6.3
Block Size Bits: 12 Cluster Size Bits: 12

The extended fiemap test utility From David:
https://gist.github.com/anonymous/6172331

# dd if=/dev/urandom of=/ocfs2/test_file bs=1M count=1000
# ./fiemap /ocfs2/test_file 4096 10
start: 4096, length: 10
File /ocfs2/test_file has 0 extents:
#	Logical          Physical         Length           Flags
	^^^^^ <-- No extent is shown

In this case, at ocfs2_fiemap(): cpos == mapping_end == 1. Hence the loop of searching extent records was not executed at all.

This patch remove the in question 'mapping_end -= cpos', and loops until the cpos is larger than the mapping_end as usual.

# ./fiemap /ocfs2/test_file 4096 10
start: 4096, length: 10
File /ocfs2/test_file has 1 extents:
#	Logical          Physical         Length           Flags
0:	0000000000000000 0000000056a01000 0000000006a00000 0000
Cc stable at vger.kernel.org
Cc Sunil Mushran <[email protected]>
Cc Mark Fashen <[email protected]>
Cc Joel Becker <[email protected]>
---
 fs/ocfs2/extent_map.c |    1 -
 1 file changed, 1 deletion(-)
fs/ocfs2/extent_map.c +0 -1
index 2487116..8460647 100644
@@ -781,7 +781,6 @@ int ocfs2_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
 	cpos = map_start >> osb->s_clustersize_bits;
 	mapping_end = ocfs2_clusters_for_bytes(inode->i_sb,
 					       map_start + map_len);
-	mapping_end -= cpos;
 	is_last = 0;
 	while (cpos < mapping_end && !is_last) {
 		u32 fe_flags;

-- 1.7.9.5