Skip to contentSkip to conversation

xfs: remove xfs_bulkstat_single

PATCH In review Jeff Liu 1 participant 1 message Jun 3, 2014 XFS filesystem

lore
Share & tools
lore

Jeff Liu

author
#0 lore raw

PATCH v3 2/10 xfs: remove xfs_bulkstat_single

From: Christoph Hellwig <[email protected]>

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.

---
 fs/xfs/xfs_ioctl.c  |  4 ++--
 fs/xfs/xfs_itable.c | 48 ------------------------------------------------
 fs/xfs/xfs_itable.h |  7 -------
 3 files changed, 2 insertions(+), 57 deletions(-)
fs/xfs/xfs_ioctl.c +2 -2
index 55724c8..eb5a366 100644
@@ -799,8 +799,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

54 lines not on this page · raw message

fs/xfs/xfs_itable.h +0 -7
index 97295d9..6ea8b39 100644
@@ -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 */
Signature · 6 lines
1.8.3.2

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs