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

Commit af819d27 authored by sandeen@sandeen.net's avatar sandeen@sandeen.net Committed by Lachlan McIlroy
Browse files

[XFS] Fix compat XFS_IOC_FSBULKSTAT_SINGLE ioctl 



The XFS_IOC_FSBULKSTAT_SINGLE ioctl passes in the
desired inode number, while XFS_IOC_FSBULKSTAT passes
in the previous/last-stat'd inode number.  The
compat handler wasn't differentiating these, so
when a XFS_IOC_FSBULKSTAT_SINGLE request for inode
128 was sent in, stat information for 131 was sent out.

Signed-off-by: default avatarEric Sandeen <sandeen@sandeen.net>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarLachlan McIlroy <lachlan@sgi.com>
parent 65fbaf24

fs/xfs/linux-2.6/xfs_ioctl32.c

+10 −3
Original line number Diff line number Diff line
@@ -291,15 +291,22 @@ xfs_compat_ioc_bulkstat( 
	if (bulkreq.ubuffer == NULL)

		return -XFS_ERROR(EINVAL);



	if (cmd == XFS_IOC_FSINUMBERS_32)

	if (cmd == XFS_IOC_FSINUMBERS_32) {

		error = xfs_inumbers(mp, &inlast, &count,

				bulkreq.ubuffer, xfs_inumbers_fmt_compat);

	else {

	} else if (cmd == XFS_IOC_FSBULKSTAT_SINGLE_32) {

		int res;



		error = xfs_bulkstat_one_compat(mp, inlast, bulkreq.ubuffer,

				sizeof(compat_xfs_bstat_t),

				NULL, 0, NULL, NULL, &res);

	} else if (cmd == XFS_IOC_FSBULKSTAT_32) {

		error = xfs_bulkstat(mp, &inlast, &count,

			xfs_bulkstat_one_compat, NULL,

			sizeof(compat_xfs_bstat_t), bulkreq.ubuffer,

			BULKSTAT_FG_QUICK, &done);

	}

	} else

		error = XFS_ERROR(EINVAL);

	if (error)

		return -error;