[PATCH] kill xfs_uuid_unmount

[PATCH] kill xfs_uuid_unmount

[Christoph Hellwig]

Quite useless wrapper that doesn't help making the code more readable.


Signed-off-by: Christoph Hellwig <hch@lst.de>

Index: linux-2.6-xfs/fs/xfs/xfs_mount.c
===================================================================
--- linux-2.6-xfs.orig/fs/xfs/xfs_mount.c	2008-04-25 20:40:50.000000000 +0200
+++ linux-2.6-xfs/fs/xfs/xfs_mount.c	2008-04-25 20:48:27.000000000 +0200
@@ -47,7 +47,6 @@
 
 STATIC int	xfs_mount_log_sb(xfs_mount_t *, __int64_t);
 STATIC int	xfs_uuid_mount(xfs_mount_t *);
-STATIC void	xfs_uuid_unmount(xfs_mount_t *mp);
 STATIC void	xfs_unmountfs_wait(xfs_mount_t *);
 
 
@@ -1262,7 +1261,7 @@ xfs_mountfs(
 	/* FALLTHROUGH */
  error1:
 	if (uuid_mounted)
-		xfs_uuid_unmount(mp);
+		uuid_table_remove(&mp->m_sb.sb_uuid);
 	xfs_freesb(mp);
 	return error;
 }
@@ -1343,7 +1342,7 @@ xfs_unmountfs(xfs_mount_t *mp, struct cr
 
 	xfs_unmountfs_close(mp, cr);
 	if ((mp->m_flags & XFS_MOUNT_NOUUID) == 0)
-		xfs_uuid_unmount(mp);
+		uuid_table_remove(&mp->m_sb.sb_uuid);
 
 #if defined(DEBUG) || defined(INDUCE_IO_ERROR)
 	xfs_errortag_clearall(mp, 0);
@@ -1905,16 +1904,6 @@ xfs_uuid_mount(
 }
 
 /*
- * Remove filesystem from the UUID table.
- */
-STATIC void
-xfs_uuid_unmount(
-	xfs_mount_t	*mp)
-{
-	uuid_table_remove(&mp->m_sb.sb_uuid);
-}
-
-/*
  * Used to log changes to the superblock unit and width fields which could
  * be altered by the mount options, as well as any potential sb_features2
  * fixup. Only the first superblock is updated.

Re: [PATCH] kill xfs_uuid_unmount

[Christoph Hellwig]

On Sat, Apr 26, 2008 at 10:09:23PM +0200, Christoph Hellwig wrote:
> Quite useless wrapper that doesn't help making the code more readable.

ping?

> 
> 
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> 
> Index: linux-2.6-xfs/fs/xfs/xfs_mount.c
> ===================================================================
> --- linux-2.6-xfs.orig/fs/xfs/xfs_mount.c	2008-04-25 20:40:50.000000000 +0200
> +++ linux-2.6-xfs/fs/xfs/xfs_mount.c	2008-04-25 20:48:27.000000000 +0200
> @@ -47,7 +47,6 @@
>  
>  STATIC int	xfs_mount_log_sb(xfs_mount_t *, __int64_t);
>  STATIC int	xfs_uuid_mount(xfs_mount_t *);
> -STATIC void	xfs_uuid_unmount(xfs_mount_t *mp);
>  STATIC void	xfs_unmountfs_wait(xfs_mount_t *);
>  
>  
> @@ -1262,7 +1261,7 @@ xfs_mountfs(
>  	/* FALLTHROUGH */
>   error1:
>  	if (uuid_mounted)
> -		xfs_uuid_unmount(mp);
> +		uuid_table_remove(&mp->m_sb.sb_uuid);
>  	xfs_freesb(mp);
>  	return error;
>  }
> @@ -1343,7 +1342,7 @@ xfs_unmountfs(xfs_mount_t *mp, struct cr
>  
>  	xfs_unmountfs_close(mp, cr);
>  	if ((mp->m_flags & XFS_MOUNT_NOUUID) == 0)
> -		xfs_uuid_unmount(mp);
> +		uuid_table_remove(&mp->m_sb.sb_uuid);
>  
>  #if defined(DEBUG) || defined(INDUCE_IO_ERROR)
>  	xfs_errortag_clearall(mp, 0);
> @@ -1905,16 +1904,6 @@ xfs_uuid_mount(
>  }
>  
>  /*
> - * Remove filesystem from the UUID table.
> - */
> -STATIC void
> -xfs_uuid_unmount(
> -	xfs_mount_t	*mp)
> -{
> -	uuid_table_remove(&mp->m_sb.sb_uuid);
> -}
> -
> -/*
>   * Used to log changes to the superblock unit and width fields which could
>   * be altered by the mount options, as well as any potential sb_features2
>   * fixup. Only the first superblock is updated.
---end quoted text---