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

xfs: remove the unused return value from xfs_log_unmount_write 



Remove the ignored return value from xfs_log_unmount_write, and also
remove a rather pointless assert on the return value from xfs_log_force.

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 cb3d425f

fs/xfs/xfs_log.c

+5 −10
Original line number Diff line number Diff line
@@ -953,8 +953,7 @@ out_err: 
 * currently architecture converted and "Unmount" is a bit foo.

 * As far as I know, there weren't any dependencies on the old behaviour.

 */



static int

static void

xfs_log_unmount_write(xfs_mount_t *mp)

{

	struct xlog	 *log = mp->m_log;
@@ -962,7 +961,6 @@ xfs_log_unmount_write(xfs_mount_t *mp) 
#ifdef DEBUG

	xlog_in_core_t	 *first_iclog;

#endif

	int		 error;



	/*

	 * Don't write out unmount record on norecovery mounts or ro devices.
@@ -971,11 +969,10 @@ xfs_log_unmount_write(xfs_mount_t *mp) 
	if (mp->m_flags & XFS_MOUNT_NORECOVERY ||

	    xfs_readonly_buftarg(log->l_targ)) {

		ASSERT(mp->m_flags & XFS_MOUNT_RDONLY);

		return 0;

		return;

	}



	error = xfs_log_force(mp, XFS_LOG_SYNC);

	ASSERT(error || !(XLOG_FORCED_SHUTDOWN(log)));

	xfs_log_force(mp, XFS_LOG_SYNC);



#ifdef DEBUG

	first_iclog = iclog = log->l_iclog;
@@ -1007,7 +1004,7 @@ xfs_log_unmount_write(xfs_mount_t *mp) 
		iclog = log->l_iclog;

		atomic_inc(&iclog->ic_refcnt);

		xlog_state_want_sync(log, iclog);

		error =  xlog_state_release_iclog(log, iclog);

		xlog_state_release_iclog(log, iclog);

		switch (iclog->ic_state) {

		case XLOG_STATE_ACTIVE:

		case XLOG_STATE_DIRTY:
@@ -1019,9 +1016,7 @@ xfs_log_unmount_write(xfs_mount_t *mp) 
			break;

		}

	}



	return error;

}	/* xfs_log_unmount_write */

}



/*

 * Empty the log for unmount/freeze.

CRA Git | Maintained and supported by SUSTech CRA and CCSE