aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTao Ma <[email protected]>2010-04-29 15:13:56 +1000
committerAlex Elder <[email protected]>2010-05-19 09:58:16 -0500
commit2d1ff3c75a4642062d314634290be6d8da4ffb03 (patch)
tree1112feee61ad0c7653c6877d04397b4949c46471
parent48389ef17583f2214bbd2c119b3015677419c16b (diff)
xfs: Make fiemap work in query mode.
According to Documentation/filesystems/fiemap.txt, If fm_extent_count is zero, then the fm_extents[] array is ignored (no extents will be returned), and the fm_mapped_extents count will hold the number of extents needed. But as the commit 97db39a1f6f69e906e98118392400de5217aa33a has changed bmv_count to the caller's input buffer, this number query function can't work any more. As this commit is written to change bmv_count from MAXEXTNUM because of ENOMEM. This patch just try to set bm.bmv_count to something sane. Thanks to Dave Chinner <[email protected]> for the suggestion. Cc: Eric Sandeen <[email protected]> Cc: Alex Elder <[email protected]> Reviewed-by: Christoph Hellwig <[email protected]> Signed-off-by: Tao Ma <[email protected]>
-rw-r--r--fs/xfs/linux-2.6/xfs_iops.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/xfs/linux-2.6/xfs_iops.c b/fs/xfs/linux-2.6/xfs_iops.c
index e65a7937f3a4..9c8019c78c92 100644
--- a/fs/xfs/linux-2.6/xfs_iops.c
+++ b/fs/xfs/linux-2.6/xfs_iops.c
@@ -673,7 +673,10 @@ xfs_vn_fiemap(
bm.bmv_length = BTOBB(length);
/* We add one because in getbmap world count includes the header */
- bm.bmv_count = fieinfo->fi_extents_max + 1;
+ bm.bmv_count = !fieinfo->fi_extents_max ? MAXEXTNUM :
+ fieinfo->fi_extents_max + 1;
+ bm.bmv_count = min_t(__s32, bm.bmv_count,
+ (PAGE_SIZE * 16 / sizeof(struct getbmapx)));
bm.bmv_iflags = BMV_IF_PREALLOC;
if (fieinfo->fi_flags & FIEMAP_FLAG_XATTR)
bm.bmv_iflags |= BMV_IF_ATTRFORK;