aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Scott <nathans@sgi.com>2005-11-03 17:49:07 -0500
committerNathan Scott <nathans@sgi.com>2005-11-03 17:49:07 -0500
commit05db218a27c955880dce6d080d5159247aad3629 (patch)
tree17bf1d374021f9313defdf534eb1ff11a94a237b
parent992c83a1295c9fff22c8cbd8ae199872a49934b9 (diff)
[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>
-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 94f0858699b5..7bdbd991ab1c 100644
--- a/fs/xfs/xfs_vfsops.c
+++ b/fs/xfs/xfs_vfsops.c
@@ -1687,7 +1687,7 @@ xfs_parseargs(
1687#endif 1687#endif
1688 1688
1689 if (!options) 1689 if (!options)
1690 return 0; 1690 goto done;
1691 1691
1692 iosize = dsunit = dswidth = vol_dsunit = vol_dswidth = 0; 1692 iosize = dsunit = dswidth = vol_dsunit = vol_dswidth = 0;
1693 1693
@@ -1867,9 +1867,9 @@ printk("XFS: irixsgid is now a sysctl(2) variable, option is deprecated.\n");
1867 args->sunit = args->swidth = 0; 1867 args->sunit = args->swidth = 0;
1868 } 1868 }
1869 1869
1870done:
1870 if (args->flags & XFSMNT_32BITINODES) 1871 if (args->flags & XFSMNT_32BITINODES)
1871 vfsp->vfs_flag |= VFS_32BITINODES; 1872 vfsp->vfs_flag |= VFS_32BITINODES;
1872
1873 if (args->flags2) 1873 if (args->flags2)
1874 args->flags |= XFSMNT_FLAGS2; 1874 args->flags |= XFSMNT_FLAGS2;
1875 return 0; 1875 return 0;