From 910832697cf85536c7fe26edb8bc6f830c4b9bb6 Mon Sep 17 00:00:00 2001 From: Eric Sandeen Date: Wed, 1 May 2019 20:26:30 -0700 Subject: xfs: change some error-less functions to void types There are several functions which have no opportunity to return an error, and don't contain any ASSERTs which could be argued to be better constructed as error cases. So, make them voids to simplify the callers. Signed-off-by: Eric Sandeen Reviewed-by: Darrick J. Wong Signed-off-by: Darrick J. Wong Reviewed-by: Dave Chinner --- fs/xfs/xfs_ioctl.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'fs/xfs/xfs_ioctl.c') diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c index 21d6f433c375..d7dfc13f30f5 100644 --- a/fs/xfs/xfs_ioctl.c +++ b/fs/xfs/xfs_ioctl.c @@ -788,11 +788,8 @@ xfs_ioc_fsgeometry( { struct xfs_fsop_geom fsgeo; size_t len; - int error; - error = xfs_fs_geometry(&mp->m_sb, &fsgeo, struct_version); - if (error) - return error; + xfs_fs_geometry(&mp->m_sb, &fsgeo, struct_version); if (struct_version <= 3) len = sizeof(struct xfs_fsop_geom_v1); @@ -2046,9 +2043,7 @@ xfs_file_ioctl( case XFS_IOC_FSCOUNTS: { xfs_fsop_counts_t out; - error = xfs_fs_counts(mp, &out); - if (error) - return error; + xfs_fs_counts(mp, &out); if (copy_to_user(arg, &out, sizeof(out))) return -EFAULT; -- cgit v1.2.3