Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 05db218a authored by Nathan Scott's avatar Nathan Scott
Browse files

[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: default avatarNathan Scott <nathans@sgi.com>
parent 992c83a1

fs/xfs/xfs_vfsops.c

+2 −2
Original line number Diff line number Diff line
@@ -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;