Commit f97a43e4 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Darrick J. Wong
Browse files

xfs: simplify the xfs_log_release_iclog calling convention 



The only caller of xfs_log_release_iclog doesn't care about the return
value, so remove it.  Also don't bother passing the mount pointer,
given that we can trivially derive it from the iclog.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent 81e5b50a

fs/xfs/xfs_log.c

+4 −6
Original line number Diff line number Diff line
@@ -597,12 +597,11 @@ xlog_state_release_iclog( 
	return 0;

}



int

void

xfs_log_release_iclog(

	struct xfs_mount        *mp,

	struct xlog_in_core	*iclog)

{

	struct xlog		*log = mp->m_log;

	struct xlog		*log = iclog->ic_log;

	bool			sync;



	if (iclog->ic_state == XLOG_STATE_IOERROR)
@@ -618,10 +617,9 @@ xfs_log_release_iclog( 
		if (sync)

			xlog_sync(log, iclog);

	}

	return 0;

	return;

error:

	xfs_force_shutdown(mp, SHUTDOWN_LOG_IO_ERROR);

	return -EIO;

	xfs_force_shutdown(log->l_mp, SHUTDOWN_LOG_IO_ERROR);

}



/*

fs/xfs/xfs_log.h

+1 −2
Original line number Diff line number Diff line
@@ -121,8 +121,7 @@ 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);

int	  xfs_log_release_iclog(struct xfs_mount *mp,

			 struct xlog_in_core	 *iclog);

void	  xfs_log_release_iclog(struct xlog_in_core *iclog);

int	  xfs_log_reserve(struct xfs_mount *mp,

			  int		   length,

			  int		   count,

fs/xfs/xfs_log_cil.c

+1 −1
Original line number Diff line number Diff line
@@ -866,7 +866,7 @@ restart: 
	spin_unlock(&cil->xc_push_lock);



	/* release the hounds! */

	xfs_log_release_iclog(log->l_mp, commit_iclog);

	xfs_log_release_iclog(commit_iclog);

	return;



out_skip:

CRA Git | Maintained and supported by SUSTech CRA and CCSE