Commit 91083269 authored by Eric Sandeen's avatar Eric Sandeen Committed by Darrick J. Wong
Browse files

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: default avatarEric Sandeen <sandeen@redhat.com>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
parent 75efa57d

fs/xfs/libxfs/xfs_dquot_buf.c

+1 −3
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ xfs_dqblk_verify( 
/*

 * Do some primitive error checking on ondisk dquot data structures.

 */

int

void

xfs_dqblk_repair(

	struct xfs_mount	*mp,

	struct xfs_dqblk	*dqb,
@@ -133,8 +133,6 @@ xfs_dqblk_repair( 
		xfs_update_cksum((char *)dqb, sizeof(struct xfs_dqblk),

				 XFS_DQUOT_CRC_OFF);

	}



	return 0;

}



STATIC bool

fs/xfs/libxfs/xfs_quota_defs.h

+1 −1
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ extern xfs_failaddr_t xfs_dquot_verify(struct xfs_mount *mp, 
extern xfs_failaddr_t xfs_dqblk_verify(struct xfs_mount *mp,

		struct xfs_dqblk *dqb, xfs_dqid_t id, uint type);

extern int xfs_calc_dquots_per_chunk(unsigned int nbblks);

extern int xfs_dqblk_repair(struct xfs_mount *mp, struct xfs_dqblk *dqb,

extern void xfs_dqblk_repair(struct xfs_mount *mp, struct xfs_dqblk *dqb,

		xfs_dqid_t id, uint type);



#endif	/* __XFS_QUOTA_H__ */

fs/xfs/libxfs/xfs_sb.c

+5 −7
Original line number Diff line number Diff line
@@ -1085,7 +1085,7 @@ out: 
	return error;

}



int

void

xfs_fs_geometry(

	struct xfs_sb		*sbp,

	struct xfs_fsop_geom	*geo,
@@ -1109,13 +1109,13 @@ xfs_fs_geometry( 
	memcpy(geo->uuid, &sbp->sb_uuid, sizeof(sbp->sb_uuid));



	if (struct_version < 2)

		return 0;

		return;



	geo->sunit = sbp->sb_unit;

	geo->swidth = sbp->sb_width;



	if (struct_version < 3)

		return 0;

		return;



	geo->version = XFS_FSOP_GEOM_VERSION;

	geo->flags = XFS_FSOP_GEOM_FLAGS_NLINK |
@@ -1159,7 +1159,7 @@ xfs_fs_geometry( 
	geo->dirblocksize = xfs_dir2_dirblock_bytes(sbp);



	if (struct_version < 4)

		return 0;

		return;



	if (xfs_sb_version_haslogv2(sbp))

		geo->flags |= XFS_FSOP_GEOM_FLAGS_LOGV2;
@@ -1167,11 +1167,9 @@ xfs_fs_geometry( 
	geo->logsunit = sbp->sb_logsunit;



	if (struct_version < 5)

		return 0;

		return;



	geo->version = XFS_FSOP_GEOM_VERSION_V5;



	return 0;

}



/* Read a secondary superblock. */

fs/xfs/libxfs/xfs_sb.h

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ extern void xfs_sb_quota_from_disk(struct xfs_sb *sbp); 
extern int	xfs_update_secondary_sbs(struct xfs_mount *mp);



#define XFS_FS_GEOM_MAX_STRUCT_VER	(4)

extern int	xfs_fs_geometry(struct xfs_sb *sbp, struct xfs_fsop_geom *geo,

extern void	xfs_fs_geometry(struct xfs_sb *sbp, struct xfs_fsop_geom *geo,

				int struct_version);

extern int	xfs_sb_read_secondary(struct xfs_mount *mp,

				struct xfs_trans *tp, xfs_agnumber_t agno,

fs/xfs/xfs_fsops.c

+1 −2
Original line number Diff line number Diff line
@@ -289,7 +289,7 @@ xfs_growfs_log( 
 * exported through ioctl XFS_IOC_FSCOUNTS

 */



int

void

xfs_fs_counts(

	xfs_mount_t		*mp,

	xfs_fsop_counts_t	*cnt)
@@ -302,7 +302,6 @@ xfs_fs_counts( 
	spin_lock(&mp->m_sb_lock);

	cnt->freertx = mp->m_sb.sb_frextents;

	spin_unlock(&mp->m_sb_lock);

	return 0;

}



/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE