--- fs/xfs/linux-2.6/xfs_ioctl.c

+++ fs/xfs/linux-2.6/xfs_ioctl.c

@@ -673,9 +673,10 @@ xfs_ioc_bulkstat(

error = xfs_bulkstat_single(mp, &inlast,

bulkreq.ubuffer, &done);

else /* XFS_IOC_FSBULKSTAT */

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

- sizeof(xfs_bstat_t), bulkreq.ubuffer,

- &done);

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

+ (bulkstat_one_pf)xfs_bulkstat_one, NULL,

+ sizeof(xfs_bstat_t), bulkreq.ubuffer,

+ BULKSTAT_FG_QUICK, &done);

if (error)

return -error;

@@ -697,19 +698,14 @@ xfs_ioc_fsgeometry_v1(

xfs_mount_t *mp,

void __user *arg)

{

- xfs_fsop_geom_t fsgeo;

+ xfs_fsop_geom_v1_t fsgeo;

int error;

- error = xfs_fs_geometry(mp, &fsgeo, 3);

+ error = xfs_fs_geometry(mp, (xfs_fsop_geom_t *)&fsgeo, 3);

if (error)

return -error;

- /*

- * Caller should have passed an argument of type

- * xfs_fsop_geom_v1_t. This is a proper subset of the

- * xfs_fsop_geom_t that xfs_fs_geometry() fills in.

- */

- if (copy_to_user(arg, &fsgeo, sizeof(xfs_fsop_geom_v1_t)))

+ if (copy_to_user(arg, &fsgeo, sizeof(fsgeo)))

return -XFS_ERROR(EFAULT);

return 0;

}