From d4c88c6b71e0f158da9eacb6314dddcc187ae599 Mon Sep 17 00:00:00 2001
From: Nathan Scott <nathans@sgi.com>
Date: Fri, 4 Nov 2005 09:49:07 +1100
Subject: [PATCH] --- yaml --- r: 12235 b: refs/heads/master c:
 05db218a27c955880dce6d080d5159247aad3629 h: refs/heads/master i:   12233:
 0901304f98ec93e1d6eb5abddf4bdf2e01a51727   12231:
 531626fef03dc7508cdf6cdbd8020b3633a05d26 v: v3

---
 [refs]                    | 2 +-
 trunk/fs/xfs/xfs_vfsops.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index e02cffd80434..8153e4d53a9a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 992c83a1295c9fff22c8cbd8ae199872a49934b9
+refs/heads/master: 05db218a27c955880dce6d080d5159247aad3629
diff --git a/trunk/fs/xfs/xfs_vfsops.c b/trunk/fs/xfs/xfs_vfsops.c
index 94f0858699b5..7bdbd991ab1c 100644
--- a/trunk/fs/xfs/xfs_vfsops.c
+++ b/trunk/fs/xfs/xfs_vfsops.c
@@ -1687,7 +1687,7 @@ xfs_parseargs(
 #endif
 
 	if (!options)
-		return 0;
+		goto done;
 
 	iosize = dsunit = dswidth = vol_dsunit = vol_dswidth = 0;
 
@@ -1867,9 +1867,9 @@ printk("XFS: irixsgid is now a sysctl(2) variable, option is deprecated.\n");
 		args->sunit = args->swidth = 0;
 	}
 
+done:
 	if (args->flags & XFSMNT_32BITINODES)
 		vfsp->vfs_flag |= VFS_32BITINODES;
-
 	if (args->flags2)
 		args->flags |= XFSMNT_FLAGS2;
 	return 0;