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

Commit 5f19c7fc authored by Darrick J. Wong's avatar Darrick J. Wong
Browse files

xfs: introduce v5 inode group structure 



Introduce a new "v5" inode group structure that fixes the alignment
and padding problems of the existing structure.

Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
parent 7035f972

fs/xfs/libxfs/xfs_fs.h

+11 −0
Original line number Diff line number Diff line
@@ -445,6 +445,17 @@ struct xfs_inogrp { 
	__u64		xi_allocmask;	/* mask of allocated inodes	*/

};



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

struct xfs_inumbers {

	uint64_t	xi_startino;	/* starting inode number	*/

	uint64_t	xi_allocmask;	/* mask of allocated inodes	*/

	uint8_t		xi_alloccount;	/* # bits set in allocmask	*/

	uint8_t		xi_version;	/* version			*/

	uint8_t		xi_padding[6];	/* zero				*/

};



#define XFS_INUMBERS_VERSION_V1	(1)

#define XFS_INUMBERS_VERSION_V5	(5)



/*

 * Error injection.

fs/xfs/xfs_ioctl.c

+6 −3
Original line number Diff line number Diff line
@@ -730,9 +730,12 @@ xfs_fsbulkstat_one_fmt( 
int

xfs_fsinumbers_fmt(

	struct xfs_ibulk		*breq,

	const struct xfs_inogrp	*igrp)

	const struct xfs_inumbers	*igrp)

{

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

	struct xfs_inogrp		ig1;



	xfs_inumbers_to_inogrp(&ig1, igrp);

	if (copy_to_user(breq->ubuffer, &ig1, sizeof(struct xfs_inogrp)))

		return -EFAULT;

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

}

fs/xfs/xfs_ioctl.h

+1 −1
Original line number Diff line number Diff line
@@ -83,6 +83,6 @@ struct xfs_inogrp; 


int xfs_fsbulkstat_one_fmt(struct xfs_ibulk *breq,

			   const struct xfs_bulkstat *bstat);

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

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



#endif

fs/xfs/xfs_ioctl32.c

+7 −3
Original line number Diff line number Diff line
@@ -82,9 +82,13 @@ xfs_compat_growfs_rt_copyin( 
STATIC int

xfs_fsinumbers_fmt_compat(

	struct xfs_ibulk		*breq,

	const struct xfs_inogrp	*igrp)

	const struct xfs_inumbers	*ig)

{

	struct compat_xfs_inogrp __user	*p32 = breq->ubuffer;

	struct xfs_inogrp		ig1;

	struct xfs_inogrp		*igrp = &ig1;



	xfs_inumbers_to_inogrp(&ig1, ig);



	if (put_user(igrp->xi_startino,   &p32->xi_startino) ||

	    put_user(igrp->xi_alloccount, &p32->xi_alloccount) ||

fs/xfs/xfs_itable.c

+13 −1
Original line number Diff line number Diff line
@@ -331,10 +331,11 @@ xfs_inumbers_walk( 
	const struct xfs_inobt_rec_incore *irec,

	void			*data)

{

	struct xfs_inogrp	inogrp = {

	struct xfs_inumbers	inogrp = {

		.xi_startino	= XFS_AGINO_TO_INO(mp, agno, irec->ir_startino),

		.xi_alloccount	= irec->ir_count - irec->ir_freecount,

		.xi_allocmask	= ~irec->ir_free,

		.xi_version	= XFS_INUMBERS_VERSION_V5,

	};

	struct xfs_inumbers_chunk *ic = data;

	xfs_agino_t		agino;
@@ -381,3 +382,14 @@ xfs_inumbers( 


	return error;

}



/* Convert an inumbers (v5) struct to a inogrp (v1) struct. */

void

xfs_inumbers_to_inogrp(

	struct xfs_inogrp		*ig1,

	const struct xfs_inumbers	*ig)

{

	ig1->xi_startino = ig->xi_startino;

	ig1->xi_alloccount = ig->xi_alloccount;

	ig1->xi_allocmask = ig->xi_allocmask;

}