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

Commit 7035f972 authored by Darrick J. Wong's avatar Darrick J. Wong
Browse files

xfs: introduce new v5 bulkstat structure 



Introduce a new version of the in-core bulkstat structure that supports
our new v5 format features.  This structure also fills the gaps in the
previous structure.  We leave wiring up the ioctls for the next patch.

Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: default avatarAllison Collins <allison.henderson@oracle.com>
Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
parent 8bfe9d18

fs/xfs/libxfs/xfs_fs.h

+47 −1
Original line number Diff line number Diff line
@@ -358,6 +358,52 @@ struct xfs_bstat { 
	__u16		bs_aextents;	/* attribute number of extents	*/

};



/* New bulkstat structure that reports v5 features and fixes padding issues */

struct xfs_bulkstat {

	uint64_t	bs_ino;		/* inode number			*/

	uint64_t	bs_size;	/* file size			*/



	uint64_t	bs_blocks;	/* number of blocks		*/

	uint64_t	bs_xflags;	/* extended flags		*/



	uint64_t	bs_atime;	/* access time, seconds		*/

	uint64_t	bs_mtime;	/* modify time, seconds		*/



	uint64_t	bs_ctime;	/* inode change time, seconds	*/

	uint64_t	bs_btime;	/* creation time, seconds	*/



	uint32_t	bs_gen;		/* generation count		*/

	uint32_t	bs_uid;		/* user id			*/

	uint32_t	bs_gid;		/* group id			*/

	uint32_t	bs_projectid;	/* project id			*/



	uint32_t	bs_atime_nsec;	/* access time, nanoseconds	*/

	uint32_t	bs_mtime_nsec;	/* modify time, nanoseconds	*/

	uint32_t	bs_ctime_nsec;	/* inode change time, nanoseconds */

	uint32_t	bs_btime_nsec;	/* creation time, nanoseconds	*/



	uint32_t	bs_blksize;	/* block size			*/

	uint32_t	bs_rdev;	/* device value			*/

	uint32_t	bs_cowextsize_blks; /* cow extent size hint, blocks */

	uint32_t	bs_extsize_blks; /* extent size hint, blocks	*/



	uint32_t	bs_nlink;	/* number of links		*/

	uint32_t	bs_extents;	/* number of extents		*/

	uint32_t	bs_aextents;	/* attribute number of extents	*/

	uint16_t	bs_version;	/* structure version		*/

	uint16_t	bs_forkoff;	/* inode fork offset in bytes	*/



	uint16_t	bs_sick;	/* sick inode metadata		*/

	uint16_t	bs_checked;	/* checked inode metadata	*/

	uint16_t	bs_mode;	/* type and mode		*/

	uint16_t	bs_pad2;	/* zeroed			*/



	uint64_t	bs_pad[7];	/* zeroed			*/

};



#define XFS_BULKSTAT_VERSION_V1	(1)

#define XFS_BULKSTAT_VERSION_V5	(5)



/* bs_sick flags */

#define XFS_BS_SICK_INODE	(1 << 0)  /* inode core */

#define XFS_BS_SICK_BMBTD	(1 << 1)  /* data fork */
@@ -374,7 +420,7 @@ struct xfs_bstat { 
 * to retain compatibility with "old" filesystems).

 */

static inline uint32_t

bstat_get_projid(struct xfs_bstat *bs)

bstat_get_projid(const struct xfs_bstat *bs)

{

	return (uint32_t)bs->bs_projid_hi << 16 | bs->bs_projid_lo;

}

fs/xfs/libxfs/xfs_health.h

+1 −1
Original line number Diff line number Diff line
@@ -185,6 +185,6 @@ xfs_inode_is_healthy(struct xfs_inode *ip) 


void xfs_fsop_geom_health(struct xfs_mount *mp, struct xfs_fsop_geom *geo);

void xfs_ag_geom_health(struct xfs_perag *pag, struct xfs_ag_geometry *ageo);

void xfs_bulkstat_health(struct xfs_inode *ip, struct xfs_bstat *bs);

void xfs_bulkstat_health(struct xfs_inode *ip, struct xfs_bulkstat *bs);



#endif	/* __XFS_HEALTH_H__ */

fs/xfs/xfs_health.c

+1 −1
Original line number Diff line number Diff line
@@ -369,7 +369,7 @@ static const struct ioctl_sick_map ino_map[] = { 
void

xfs_bulkstat_health(

	struct xfs_inode		*ip,

	struct xfs_bstat		*bs)

	struct xfs_bulkstat		*bs)

{

	const struct ioctl_sick_map	*m;

	unsigned int			sick;

fs/xfs/xfs_ioctl.c

+6 −3
Original line number Diff line number Diff line
@@ -717,9 +717,12 @@ xfs_ioc_space( 
int

xfs_fsbulkstat_one_fmt(

	struct xfs_ibulk		*breq,

	const struct xfs_bstat	*bstat)

	const struct xfs_bulkstat	*bstat)

{

	if (copy_to_user(breq->ubuffer, bstat, sizeof(*bstat)))

	struct xfs_bstat		bs1;



	xfs_bulkstat_to_bstat(breq->mp, &bs1, bstat);

	if (copy_to_user(breq->ubuffer, &bs1, sizeof(bs1)))

		return -EFAULT;

	return xfs_ibulk_advance(breq, sizeof(struct xfs_bstat));

}

fs/xfs/xfs_ioctl.h

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ struct xfs_bstat; 
struct xfs_inogrp;



int xfs_fsbulkstat_one_fmt(struct xfs_ibulk *breq,

			   const struct xfs_bstat *bstat);

			   const struct xfs_bulkstat *bstat);

int xfs_fsinumbers_fmt(struct xfs_ibulk *breq, const struct xfs_inogrp *igrp);



#endif