diff options
| author | Eric Sandeen <sandeen@sandeen.net> | 2019-05-01 20:26:30 -0700 |
|---|---|---|
| committer | Darrick J. Wong <darrick.wong@oracle.com> | 2019-05-01 20:26:30 -0700 |
| commit | 910832697cf85536c7fe26edb8bc6f830c4b9bb6 (patch) | |
| tree | 7209ecf8be203230e30b679156767e63ff88ebd1 /fs/xfs/xfs_ioctl.c | |
| parent | 75efa57d0bf5fcf650a183f0ce0dc011ba8c4bc8 (diff) | |
xfs: change some error-less functions to void typesxfs-5.2-merge-4
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 <sandeen@redhat.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Diffstat (limited to 'fs/xfs/xfs_ioctl.c')
| -rw-r--r-- | fs/xfs/xfs_ioctl.c | 9 |
1 files changed, 2 insertions, 7 deletions
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; |