Commit a7a9250e authored by Hariprasad Kelam's avatar Hariprasad Kelam Committed by Darrick J. Wong
Browse files

fs: xfs: xfs_log: Change return type from int to void 



Change return types of below functions as they never fails
xfs_log_mount_cancel
xlog_recover_cancel
xlog_recover_cancel_intents

fix below issue reported by coccicheck
fs/xfs/xfs_log_recover.c:4886:7-12: Unneeded variable: "error". Return
"0" on line 4926

Signed-off-by: default avatarHariprasad Kelam <hariprasad.kelam@gmail.com>
Reviewed-by: default avatarEric Sandeen <sandeen@redhat.com>
Reviewed-by: default avatarCarlos Maiolino <cmaiolino@redhat.com>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent 3e5a428b

fs/xfs/xfs_log.c

+2 −6
Original line number Diff line number Diff line
@@ -769,16 +769,12 @@ xfs_log_mount_finish( 
 * The mount has failed. Cancel the recovery if it hasn't completed and destroy

 * the log.

 */

int

void

xfs_log_mount_cancel(

	struct xfs_mount	*mp)

{

	int			error;



	error = xlog_recover_cancel(mp->m_log);

	xlog_recover_cancel(mp->m_log);

	xfs_log_unmount(mp);



	return error;

}



/*

fs/xfs/xfs_log.h

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ int xfs_log_mount(struct xfs_mount *mp, 
			xfs_daddr_t		start_block,

			int		 	num_bblocks);

int	  xfs_log_mount_finish(struct xfs_mount *mp);

int	xfs_log_mount_cancel(struct xfs_mount *);

void	xfs_log_mount_cancel(struct xfs_mount *);

xfs_lsn_t xlog_assign_tail_lsn(struct xfs_mount *mp);

xfs_lsn_t xlog_assign_tail_lsn_locked(struct xfs_mount *mp);

void	  xfs_log_space_wake(struct xfs_mount *mp);

fs/xfs/xfs_log_priv.h

+1 −1
Original line number Diff line number Diff line
@@ -418,7 +418,7 @@ xlog_recover( 
extern int

xlog_recover_finish(

	struct xlog		*log);

extern int

extern void

xlog_recover_cancel(struct xlog *);



extern __le32	 xlog_cksum(struct xlog *log, struct xlog_rec_header *rhead,

fs/xfs/xfs_log_recover.c

+3 −9
Original line number Diff line number Diff line
@@ -4875,12 +4875,11 @@ out: 
 * A cancel occurs when the mount has failed and we're bailing out.

 * Release all pending log intent items so they don't pin the AIL.

 */

STATIC int

STATIC void

xlog_recover_cancel_intents(

	struct xlog		*log)

{

	struct xfs_log_item	*lip;

	int			error = 0;

	struct xfs_ail_cursor	cur;

	struct xfs_ail		*ailp;
@@ -4920,7 +4919,6 @@ xlog_recover_cancel_intents( 


	xfs_trans_ail_cursor_done(&cur);

	spin_unlock(&ailp->ail_lock);

	return error;

}



/*
@@ -5779,16 +5777,12 @@ xlog_recover_finish( 
	return 0;

}



int

void

xlog_recover_cancel(

	struct xlog	*log)

{

	int		error = 0;



	if (log->l_flags & XLOG_RECOVERY_NEEDED)

		error = xlog_recover_cancel_intents(log);



	return error;

		xlog_recover_cancel_intents(log);

}



#if defined(DEBUG)

CRA Git | Maintained and supported by SUSTech CRA and CCSE