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

Commit d716f8ee authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Dave Chinner
Browse files

xfs: remove xfs_bulkstat_single 



From: Christoph Hellwig <hch@lst.de>

xfs_bukstat_one doesn't have any failure case that would go away when
called through xfs_bulkstat, so remove the fallback and the now unessecary
xfs_bulkstat_single function.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarJie Liu <jeff.liu@oracle.com>
Signed-off-by: default avatarJie Liu <jeff.liu@oracle.com>
Signed-off-by: default avatarDave Chinner <david@fromorbit.com>
parent 8fe65776

fs/xfs/xfs_ioctl.c

+2 −2
Original line number Diff line number Diff line
@@ -796,8 +796,8 @@ xfs_ioc_bulkstat( 
		error = xfs_inumbers(mp, &inlast, &count,

					bulkreq.ubuffer, xfs_inumbers_fmt);

	else if (cmd == XFS_IOC_FSBULKSTAT_SINGLE)

		error = xfs_bulkstat_single(mp, &inlast,

						bulkreq.ubuffer, &done);

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

					sizeof(xfs_bstat_t), NULL, &done);

	else	/* XFS_IOC_FSBULKSTAT */

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

				     sizeof(xfs_bstat_t), bulkreq.ubuffer,

fs/xfs/xfs_itable.c

+0 −48
Original line number Diff line number Diff line
@@ -509,54 +509,6 @@ xfs_bulkstat( 
	return rval;

}



/*

 * Return stat information in bulk (by-inode) for the filesystem.

 * Special case for non-sequential one inode bulkstat.

 */

int					/* error status */

xfs_bulkstat_single(

	xfs_mount_t		*mp,	/* mount point for filesystem */

	xfs_ino_t		*lastinop, /* inode to return */

	char			__user *buffer, /* buffer with inode stats */

	int			*done)	/* 1 if there are more stats to get */

{

	int			count;	/* count value for bulkstat call */

	int			error;	/* return value */

	xfs_ino_t		ino;	/* filesystem inode number */

	int			res;	/* result from bs1 */



	/*

	 * note that requesting valid inode numbers which are not allocated

	 * to inodes will most likely cause xfs_imap_to_bp to generate warning

	 * messages about bad magic numbers. This is ok. The fact that

	 * the inode isn't actually an inode is handled by the

	 * error check below. Done this way to make the usual case faster

	 * at the expense of the error case.

	 */



	ino = *lastinop;

	error = xfs_bulkstat_one(mp, ino, buffer, sizeof(xfs_bstat_t),

				 NULL, &res);

	if (error) {

		/*

		 * Special case way failed, do it the "long" way

		 * to see if that works.

		 */

		(*lastinop)--;

		count = 1;

		if (xfs_bulkstat(mp, lastinop, &count, xfs_bulkstat_one,

				sizeof(xfs_bstat_t), buffer, done))

			return error;

		if (count == 0 || (xfs_ino_t)*lastinop != ino)

			return error == -EFSCORRUPTED ?

				EINVAL : error;

		else

			return 0;

	}

	*done = 0;

	return 0;

}



int

xfs_inumbers_fmt(

	void			__user *ubuffer, /* buffer to write to */

fs/xfs/xfs_itable.h

+0 −7
Original line number Diff line number Diff line
@@ -50,13 +50,6 @@ xfs_bulkstat( 
	char		__user *ubuffer,/* buffer with inode stats */

	int		*done);		/* 1 if there are more stats to get */



int

xfs_bulkstat_single(

	xfs_mount_t		*mp,

	xfs_ino_t		*lastinop,

	char			__user *buffer,

	int			*done);



typedef int (*bulkstat_one_fmt_pf)(  /* used size in bytes or negative error */

	void			__user *ubuffer, /* buffer to write to */

	int			ubsize,		 /* remaining user buffer sz */