From 9b967bae33c4b8e6f8903b38006fa64e52ae9f3c Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@infradead.org>
Date: Wed, 13 Aug 2008 16:49:57 +1000
Subject: [PATCH] --- yaml --- r: 108335 b: refs/heads/master c:
 41b5c2e77a0221cf07ac127afa122add67ac5418 h: refs/heads/master i:   108333:
 53b34606a9d6e733740256c7ac5dfe34634434f9   108331:
 634aa77ea610b966804f5b7407e1c62f2a0b5a95   108327:
 c489eca5a2ebde01c16b12237207392f04cdc3a7   108319:
 2c3fe607e28184775154b0b3e5403bc8f0016bcc v: v3

---
 [refs]                   |  2 +-
 trunk/fs/xfs/xfs_mount.c | 12 +++++-------
 trunk/fs/xfs/xfs_mount.h |  2 +-
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 61abc807ff31..7d1a876ed6cc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4249023a5d14f28d4e68ba15d24d25c0e5be71a6
+refs/heads/master: 41b5c2e77a0221cf07ac127afa122add67ac5418
diff --git a/trunk/fs/xfs/xfs_mount.c b/trunk/fs/xfs/xfs_mount.c
index 06f0a73bc93f..7f5027266ea0 100644
--- a/trunk/fs/xfs/xfs_mount.c
+++ b/trunk/fs/xfs/xfs_mount.c
@@ -1229,16 +1229,15 @@ xfs_mountfs(
 }
 
 /*
- * xfs_unmountfs
- *
  * This flushes out the inodes,dquots and the superblock, unmounts the
  * log and makes sure that incore structures are freed.
  */
-int
-xfs_unmountfs(xfs_mount_t *mp)
+void
+xfs_unmountfs(
+	struct xfs_mount	*mp)
 {
-	__uint64_t	resblks;
-	int		error = 0;
+	__uint64_t		resblks;
+	int			error;
 
 	IRELE(mp->m_rootip);
 
@@ -1311,7 +1310,6 @@ xfs_unmountfs(xfs_mount_t *mp)
 	xfs_errortag_clearall(mp, 0);
 #endif
 	xfs_mount_free(mp);
-	return 0;
 }
 
 STATIC void
diff --git a/trunk/fs/xfs/xfs_mount.h b/trunk/fs/xfs/xfs_mount.h
index 02c16b9ce2ab..f3c1024b1241 100644
--- a/trunk/fs/xfs/xfs_mount.h
+++ b/trunk/fs/xfs/xfs_mount.h
@@ -513,7 +513,7 @@ extern int	xfs_log_sbcount(xfs_mount_t *, uint);
 extern int	xfs_mountfs(xfs_mount_t *mp);
 extern void	xfs_mountfs_check_barriers(xfs_mount_t *mp);
 
-extern int	xfs_unmountfs(xfs_mount_t *);
+extern void	xfs_unmountfs(xfs_mount_t *);
 extern int	xfs_unmountfs_writesb(xfs_mount_t *);
 extern int	xfs_unmount_flush(xfs_mount_t *, int);
 extern int	xfs_mod_incore_sb(xfs_mount_t *, xfs_sb_field_t, int64_t, int);