Commit 97db39a1 authored by Eric Sandeen's avatar Eric Sandeen Committed by Felix Blyakher

xfs: reduce bmv_count in xfs_vn_fiemap

commit 6321e3ed caused
the full bmv_count's worth of getbmapx structures to get
allocated; telling it to do MAXEXTNUM was a bit insane,
resulting in ENOMEM every time.

Chop it down to something reasonable, the number of slots
in the caller's input buffer.  If this is too large the
caller may get ENOMEM but the reason should not be a
mystery, and they can try again with something smaller.

We add 1 to the value because in the normal getbmap
world, bmv_count includes the header and xfs_getbmap does:

        nex = bmv->bmv_count - 1;
        if (nex <= 0)
                return XFS_ERROR(EINVAL);
Signed-off-by: default avatarEric Sandeen <sandeen@sandeen.net>
Reviewed-by: default avatarOlaf Weber <olaf@sgi.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarFelix Blyakher <felixb@sgi.com>
parent fd402613
...@@ -680,8 +680,8 @@ xfs_vn_fiemap( ...@@ -680,8 +680,8 @@ xfs_vn_fiemap(
else else
bm.bmv_length = BTOBB(length); bm.bmv_length = BTOBB(length);
/* our formatter will tell xfs_getbmap when to stop. */ /* We add one because in getbmap world count includes the header */
bm.bmv_count = MAXEXTNUM; bm.bmv_count = fieinfo->fi_extents_max + 1;
bm.bmv_iflags = BMV_IF_PREALLOC; bm.bmv_iflags = BMV_IF_PREALLOC;
if (fieinfo->fi_flags & FIEMAP_FLAG_XATTR) if (fieinfo->fi_flags & FIEMAP_FLAG_XATTR)
bm.bmv_iflags |= BMV_IF_ATTRFORK; bm.bmv_iflags |= BMV_IF_ATTRFORK;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment