From: Nathan Scott <nathans@sgi.com>
Date: Thu, 3 Nov 2005 22:49:07 +0000 (+1100)
Subject: [XFS] Fix an inode32 regression - if no options are presented, must still
X-Git-Tag: v2.6.15-rc1~450^2~2^2~1
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=05db218a27c955880dce6d080d5159247aad3629;p=linux-2.6

[XFS] Fix an inode32 regression - if no options are presented, must still
set default flags.

SGI-PV: 945242
SGI-Modid: xfs-linux-melb:xfs-kern:24292a

Signed-off-by: Nathan Scott <nathans@sgi.com>
---

diff --git a/fs/xfs/xfs_vfsops.c b/fs/xfs/xfs_vfsops.c
index 94f0858699..7bdbd991ab 100644
--- a/fs/xfs/xfs_vfsops.c
+++ b/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;