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

Commit 2900a579 authored Oct 02, 2013 by Mark Tinguely Committed by Ben Myers Oct 08, 2013

xfs: add the inode directory type support to XFS_IOC_FSGEOM



Add the inode type directory type support to XFS_IOC_FSGEOM
so that xfs_repair/xfs_info knows if the superblock v4 filesystem
enabled the feature.

Signed-off-by: Mark Tinguely <tinguely@sgi.com>
Reviewed-by: Carlos Maiolino <cmaiolino@redhat.com>
Signed-off-by: Ben Myers <bpm@sgi.com>

parent d948709b

fs/xfs/xfs_fs.h

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -237,7 +237,7 @@ typedef struct xfs_fsop_resblks {
	#define XFS_FSOP_GEOM_FLAGS_DIRV2CI 0x1000 /* ASCII only CI names */		#define XFS_FSOP_GEOM_FLAGS_DIRV2CI 0x1000 /* ASCII only CI names */
	#define XFS_FSOP_GEOM_FLAGS_LAZYSB 0x4000 /* lazy superblock counters */		#define XFS_FSOP_GEOM_FLAGS_LAZYSB 0x4000 /* lazy superblock counters */
	#define XFS_FSOP_GEOM_FLAGS_V5SB 0x8000 /* version 5 superblock */		#define XFS_FSOP_GEOM_FLAGS_V5SB 0x8000 /* version 5 superblock */
			#define XFS_FSOP_GEOM_FLAGS_FTYPE 0x10000 /* inode directory types */

	/*		/*
	* Minimum and maximum sizes need for growth checks.		* Minimum and maximum sizes need for growth checks.

fs/xfs/xfs_fsops.c

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -101,7 +101,9 @@ xfs_fs_geometry(
	(xfs_sb_version_hasprojid32bit(&mp->m_sb) ?		(xfs_sb_version_hasprojid32bit(&mp->m_sb) ?
	XFS_FSOP_GEOM_FLAGS_PROJID32 : 0) \|		XFS_FSOP_GEOM_FLAGS_PROJID32 : 0) \|
	(xfs_sb_version_hascrc(&mp->m_sb) ?		(xfs_sb_version_hascrc(&mp->m_sb) ?
	XFS_FSOP_GEOM_FLAGS_V5SB : 0);		XFS_FSOP_GEOM_FLAGS_V5SB : 0) \|
			(xfs_sb_version_hasftype(&mp->m_sb) ?
			XFS_FSOP_GEOM_FLAGS_FTYPE : 0);
	geo->logsectsize = xfs_sb_version_hassector(&mp->m_sb) ?		geo->logsectsize = xfs_sb_version_hassector(&mp->m_sb) ?
	mp->m_sb.sb_logsectsize : BBSIZE;		mp->m_sb.sb_logsectsize : BBSIZE;
	geo->rtsectsize = mp->m_sb.sb_blocksize;		geo->rtsectsize = mp->m_sb.sb_blocksize;