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

Commit 42b67dc6 authored Oct 19, 2017 by Christoph Hellwig Committed by Darrick J. Wong Oct 26, 2017

xfs: remove the never fully implemented UUID fork format



Remove the dead code dealing with the UUID fork format that was never
implemented in Linux (and neither in IRIX as far as I know).

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>

parent e8e0e170

fs/xfs/libxfs/xfs_attr_leaf.c

+1 −5

Original line number	Diff line number	Diff line
		@@ -397,13 +397,9 @@ xfs_attr_shortform_bytesfit(xfs_inode_t *dp, int bytes)
		/* rounded down */
		offset = (XFS_LITINO(mp, dp->i_d.di_version) - bytes) >> 3;

		switch (dp->i_d.di_format) {
		case XFS_DINODE_FMT_DEV:
		if (dp->i_d.di_format == XFS_DINODE_FMT_DEV) {
		minforkoff = roundup(sizeof(xfs_dev_t), 8) >> 3;
		return (offset >= minforkoff) ? minforkoff : 0;
		case XFS_DINODE_FMT_UUID:
		minforkoff = roundup(sizeof(uuid_t), 8) >> 3;
		return (offset >= minforkoff) ? minforkoff : 0;
		}

		/*

fs/xfs/libxfs/xfs_bmap.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -231,7 +231,6 @@ xfs_bmap_forkoff_reset(
		{
		if (whichfork == XFS_ATTR_FORK &&
		ip->i_d.di_format != XFS_DINODE_FMT_DEV &&
		ip->i_d.di_format != XFS_DINODE_FMT_UUID &&
		ip->i_d.di_format != XFS_DINODE_FMT_BTREE) {
		uint dfl_forkoff = xfs_default_attroffset(ip) >> 3;

		@@ -1086,9 +1085,6 @@ xfs_bmap_add_attrfork(
		case XFS_DINODE_FMT_DEV:
		ip->i_d.di_forkoff = roundup(sizeof(xfs_dev_t), 8) >> 3;
		break;
		case XFS_DINODE_FMT_UUID:
		ip->i_d.di_forkoff = roundup(sizeof(uuid_t), 8) >> 3;
		break;
		case XFS_DINODE_FMT_LOCAL:
		case XFS_DINODE_FMT_EXTENTS:
		case XFS_DINODE_FMT_BTREE:

fs/xfs/libxfs/xfs_format.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -946,7 +946,7 @@ typedef enum xfs_dinode_fmt {
		XFS_DINODE_FMT_LOCAL, /* bulk data */
		XFS_DINODE_FMT_EXTENTS, /* struct xfs_bmbt_rec */
		XFS_DINODE_FMT_BTREE, /* struct xfs_bmdr_block */
		XFS_DINODE_FMT_UUID /* uuid_t */
		XFS_DINODE_FMT_UUID /* added long ago, but never used */
		} xfs_dinode_fmt_t;

		/*

fs/xfs/libxfs/xfs_inode_fork.c

+0 −9

Original line number	Diff line number	Diff line
		@@ -902,15 +902,6 @@ xfs_iflush_fork(
		}
		break;

		case XFS_DINODE_FMT_UUID:
		if (iip->ili_fields & XFS_ILOG_UUID) {
		ASSERT(whichfork == XFS_DATA_FORK);
		memcpy(XFS_DFORK_DPTR(dip),
		&ip->i_df.if_u2.if_uuid,
		sizeof(uuid_t));
		}
		break;

		default:
		ASSERT(0);
		break;

fs/xfs/libxfs/xfs_inode_fork.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -70,7 +70,6 @@ typedef struct xfs_ifork {
		char if_inline_data[XFS_INLINE_DATA];
		/* very small file data */
		xfs_dev_t if_rdev; /* dev number if special */
		uuid_t if_uuid; /* mount point value */
		} if_u2;
		} xfs_ifork_t;