Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 21b699c8 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Christoph Hellwig
Browse files

xfs: cleanup log unmount handling 



Kill the current xfs_log_unmount wrapper and opencode the two function
calls in the only caller.  Rename the current xfs_log_unmount_dealloc to
xfs_log_unmount as it undoes xfs_log_mount and the new name makes that
more clear.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDave Chinner <david@fromorbit.com>
parent da5309cd

fs/xfs/xfs_log.c

+1 −14
Original line number Diff line number Diff line
@@ -634,19 +634,6 @@ xfs_log_mount_finish(xfs_mount_t *mp) 
	return error;

}



/*

 * Unmount processing for the log.

 */

int

xfs_log_unmount(xfs_mount_t *mp)

{

	int		error;



	error = xfs_log_unmount_write(mp);

	xfs_log_unmount_dealloc(mp);

	return error;

}



/*

 * Final log writes as part of unmount.

 *
@@ -797,7 +784,7 @@ xfs_log_unmount_write(xfs_mount_t *mp) 
 * and deallocate the log as the aild references the log.

 */

void

xfs_log_unmount_dealloc(xfs_mount_t *mp)

xfs_log_unmount(xfs_mount_t *mp)

{

	xfs_trans_ail_destroy(mp);

	xlog_dealloc_log(mp->m_log);

fs/xfs/xfs_log.h

+1 −2
Original line number Diff line number Diff line
@@ -170,9 +170,8 @@ int xfs_log_write(struct xfs_mount *mp, 
			int		 nentries,

			xfs_log_ticket_t ticket,

			xfs_lsn_t	 *start_lsn);

int	  xfs_log_unmount(struct xfs_mount *mp);

int	  xfs_log_unmount_write(struct xfs_mount *mp);

void      xfs_log_unmount_dealloc(struct xfs_mount *mp);

void      xfs_log_unmount(struct xfs_mount *mp);

int	  xfs_log_force_umount(struct xfs_mount *mp, int logerror);

int	  xfs_log_need_covered(struct xfs_mount *mp);

fs/xfs/xfs_mount.c

+3 −2
Original line number Diff line number Diff line
@@ -1194,7 +1194,7 @@ xfs_mountfs( 
 out_rele_rip:

	IRELE(rip);

 out_log_dealloc:

	xfs_log_unmount_dealloc(mp);

	xfs_log_unmount(mp);

 out_free_perag:

	xfs_free_perag(mp);

 out_remove_uuid:
@@ -1280,7 +1280,8 @@ xfs_unmountfs( 
				"Freespace may not be correct on next mount.");

	xfs_unmountfs_writesb(mp);

	xfs_unmountfs_wait(mp); 		/* wait for async bufs */

	xfs_log_unmount(mp);			/* Done! No more fs ops. */

	xfs_log_unmount_write(mp);

	xfs_log_unmount(mp);



	if ((mp->m_flags & XFS_MOUNT_NOUUID) == 0)

		uuid_table_remove(&mp->m_sb.sb_uuid);