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

Commit 69a58a43 authored by Eric Sandeen's avatar Eric Sandeen Committed by Ben Myers
Browse files

xfs: report projid32bit feature in geometry call 



When xfs gained the projid32bit feature, it was never added to
the FSGEOMETRY ioctl feature flags, so it's not queryable without
this patch.

Signed-off-by: default avatarEric Sandeen <sandeen@redhat.com>
Reviewed-by: default avatarCarlos Maiolino <cmaiolino@redhat.com>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
Signed-off-by: default avatarBen Myers <bpm@sgi.com>
parent 009507b0

fs/xfs/xfs_fs.h

+2 −1
Original line number Diff line number Diff line
@@ -233,6 +233,7 @@ typedef struct xfs_fsop_resblks { 
#define XFS_FSOP_GEOM_FLAGS_LOGV2	0x0100	/* log format version 2	*/

#define XFS_FSOP_GEOM_FLAGS_SECTOR	0x0200	/* sector sizes >1BB	*/

#define XFS_FSOP_GEOM_FLAGS_ATTR2	0x0400	/* inline attributes rework */

#define XFS_FSOP_GEOM_FLAGS_PROJID32	0x0800  /* 32-bit project IDs	*/

#define XFS_FSOP_GEOM_FLAGS_DIRV2CI	0x1000	/* ASCII only CI names	*/

#define XFS_FSOP_GEOM_FLAGS_LAZYSB	0x4000	/* lazy superblock counters */

fs/xfs/xfs_fsops.c

+3 −1
Original line number Diff line number Diff line
@@ -97,7 +97,9 @@ xfs_fs_geometry( 
			(xfs_sb_version_haslazysbcount(&mp->m_sb) ?

				XFS_FSOP_GEOM_FLAGS_LAZYSB : 0) |

			(xfs_sb_version_hasattr2(&mp->m_sb) ?

				XFS_FSOP_GEOM_FLAGS_ATTR2 : 0);

				XFS_FSOP_GEOM_FLAGS_ATTR2 : 0) |

			(xfs_sb_version_hasprojid32bit(&mp->m_sb) ?

				XFS_FSOP_GEOM_FLAGS_PROJID32 : 0);

		geo->logsectsize = xfs_sb_version_hassector(&mp->m_sb) ?

				mp->m_sb.sb_logsectsize : BBSIZE;

		geo->rtsectsize = mp->m_sb.sb_blocksize;