summaryrefslogtreecommitdiffstats
path: root/fs/xfs
diff options
context:
space:
mode:
authorNathan Scott <nathans@sgi.com>2005-11-04 09:49:07 +1100
committerNathan Scott <nathans@sgi.com>2005-11-04 09:49:07 +1100
commit05db218a27c955880dce6d080d5159247aad3629 (patch)
tree17bf1d374021f9313defdf534eb1ff11a94a237b /fs/xfs
parent992c83a1295c9fff22c8cbd8ae199872a49934b9 (diff)
downloadop-kernel-dev-05db218a27c955880dce6d080d5159247aad3629.zip
op-kernel-dev-05db218a27c955880dce6d080d5159247aad3629.tar.gz
[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>
Diffstat (limited to 'fs/xfs')
-rw-r--r--fs/xfs/xfs_vfsops.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/xfs/xfs_vfsops.c b/fs/xfs/xfs_vfsops.c
index 94f0858..7bdbd99 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;
OpenPOWER on IntegriCloud