Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1dbba086 authored Jan 27, 2017 by Eric Sandeen Committed by Darrick J. Wong Jan 30, 2017

xfs: remove unused full argument from bmap



The "full" argument was used only by the fiemap formatter,
which is now gone with the iomap updates.

Remove the unused arg.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Alex Elder <elder@linaro.org>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>

parent e4229d6b

fs/xfs/xfs_bmap_util.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -787,11 +787,9 @@ xfs_getbmap(
		xfs_iunlock(ip, XFS_IOLOCK_SHARED);

		for (i = 0; i < cur_ext; i++) {
		int full = 0; /* user array is full */

		/* format results & advance arg */
		error = formatter(&arg, &out[i], &full);
		if (error \|\| full)
		error = formatter(&arg, &out[i]);
		if (error)
		break;
		}

fs/xfs/xfs_bmap_util.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -35,7 +35,7 @@ int xfs_bmap_punch_delalloc_range(struct xfs_inode *ip,
		xfs_fileoff_t start_fsb, xfs_fileoff_t length);

		/* bmap to userspace formatter - copy to user & advance pointer */
		typedef int (xfs_bmap_format_t)(void , struct getbmapx , int *);
		typedef int (xfs_bmap_format_t)(void , struct getbmapx );
		int xfs_getbmap(struct xfs_inode ip, struct getbmapx bmv,
		xfs_bmap_format_t formatter, void *arg);

fs/xfs/xfs_ioctl.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1524,7 +1524,7 @@ xfs_ioc_setxflags(
		}

		STATIC int
		xfs_getbmap_format(void *ap, struct getbmapx bmv, int *full)
		xfs_getbmap_format(void *ap, struct getbmapx bmv)
		{
		struct getbmap __user base = (struct getbmap __user )*ap;

		@@ -1567,7 +1567,7 @@ xfs_ioc_getbmap(
		}

		STATIC int
		xfs_getbmapx_format(void *ap, struct getbmapx bmv, int *full)
		xfs_getbmapx_format(void *ap, struct getbmapx bmv)
		{
		struct getbmapx __user base = (struct getbmapx __user )*ap;