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

Commit 08bf5404 authored by Carlos Maiolino's avatar Carlos Maiolino Committed by Ben Myers
Browse files

xfs: make inode64 as the default allocation mode 



since 64-bit inodes can be accessed while using inode32, and these can
also be used on 32-bit kernels, there is no reason to still keep inode32
as the default mount option.  If the filesystem cannot handle 64bit
inode numbers (i.e CONFIG_LBDAF is not enabled and BITS_PER_LONG == 32),
XFS_MOUNT_SMALL_INUMS will still be set by default, so inode64 is not an
unconditional default value.

Signed-off-by: default avatarCarlos Maiolino <cmaiolino@redhat.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarMark Tinguely <tinguely@sgi.com>
Signed-off-by: default avatarBen Myers <bpm@sgi.com>
parent 8aea3ff4

fs/xfs/xfs_super.c

+7 −0
Original line number Original line Diff line number Diff line
@@ -88,6 +88,8 @@ mempool_t *xfs_ioend_pool; 
					 * unwritten extent conversion */

					 * unwritten extent conversion */

#define MNTOPT_NOBARRIER "nobarrier"	/* .. disable */

#define MNTOPT_NOBARRIER "nobarrier"	/* .. disable */

#define MNTOPT_64BITINODE   "inode64"	/* inodes can be allocated anywhere */

#define MNTOPT_64BITINODE   "inode64"	/* inodes can be allocated anywhere */

#define MNTOPT_32BITINODE   "inode32"	/* inode allocation limited to

					 * XFS_MAXINUMBER_32 */

#define MNTOPT_IKEEP	"ikeep"		/* do not free empty inode clusters */

#define MNTOPT_IKEEP	"ikeep"		/* do not free empty inode clusters */

#define MNTOPT_NOIKEEP	"noikeep"	/* free empty inode clusters */

#define MNTOPT_NOIKEEP	"noikeep"	/* free empty inode clusters */

#define MNTOPT_LARGEIO	   "largeio"	/* report large I/O sizes in stat() */

#define MNTOPT_LARGEIO	   "largeio"	/* report large I/O sizes in stat() */
@@ -198,7 +200,9 @@ xfs_parseargs( 
	 */

	 */

	mp->m_flags |= XFS_MOUNT_BARRIER;

	mp->m_flags |= XFS_MOUNT_BARRIER;

	mp->m_flags |= XFS_MOUNT_COMPAT_IOSIZE;

	mp->m_flags |= XFS_MOUNT_COMPAT_IOSIZE;

#if !XFS_BIG_INUMS

	mp->m_flags |= XFS_MOUNT_SMALL_INUMS;

	mp->m_flags |= XFS_MOUNT_SMALL_INUMS;

#endif





	/*

	/*

	 * These can be overridden by the mount option parsing.

	 * These can be overridden by the mount option parsing.
@@ -295,6 +299,8 @@ xfs_parseargs( 
				return EINVAL;

				return EINVAL;

			}

			}

			dswidth = simple_strtoul(value, &eov, 10);

			dswidth = simple_strtoul(value, &eov, 10);

		} else if (!strcmp(this_char, MNTOPT_32BITINODE)) {

			mp->m_flags |= XFS_MOUNT_SMALL_INUMS;

		} else if (!strcmp(this_char, MNTOPT_64BITINODE)) {

		} else if (!strcmp(this_char, MNTOPT_64BITINODE)) {

			mp->m_flags &= ~XFS_MOUNT_SMALL_INUMS;

			mp->m_flags &= ~XFS_MOUNT_SMALL_INUMS;

#if !XFS_BIG_INUMS

#if !XFS_BIG_INUMS
@@ -493,6 +499,7 @@ xfs_showargs( 
		{ XFS_MOUNT_FILESTREAMS,	"," MNTOPT_FILESTREAM },

		{ XFS_MOUNT_FILESTREAMS,	"," MNTOPT_FILESTREAM },

		{ XFS_MOUNT_GRPID,		"," MNTOPT_GRPID },

		{ XFS_MOUNT_GRPID,		"," MNTOPT_GRPID },

		{ XFS_MOUNT_DISCARD,		"," MNTOPT_DISCARD },

		{ XFS_MOUNT_DISCARD,		"," MNTOPT_DISCARD },

		{ XFS_MOUNT_SMALL_INUMS,	"," MNTOPT_32BITINODE },

		{ 0, NULL }

		{ 0, NULL }

	};

	};

	static struct proc_xfs_info xfs_info_unset[] = {

	static struct proc_xfs_info xfs_info_unset[] = {