xfs: cleanup xfs_dir2_data_entsize (711c7dbf) · Commits · 戴 / test

fs/xfs/libxfs/xfs_da_format.c

+0 −33

Original line number	Diff line number	Diff line
		@@ -19,39 +19,6 @@
		* Directory data block operations
		*/

		/*
		* For special situations, the dirent size ends up fixed because we always know
		* what the size of the entry is. That's true for the "." and "..", and
		* therefore we know that they are a fixed size and hence their offsets are
		* constant, as is the first entry.
		*
		* Hence, this calculation is written as a macro to be able to be calculated at
		* compile time and so certain offsets can be calculated directly in the
		* structure initaliser via the macro. There are two macros - one for dirents
		* with ftype and without so there are no unresolvable conditionals in the
		* calculations. We also use round_up() as XFS_DIR2_DATA_ALIGN is always a power
		* of 2 and the compiler doesn't reject it (unlike roundup()).
		*/
		#define XFS_DIR2_DATA_ENTSIZE(n) \
		round_up((offsetof(struct xfs_dir2_data_entry, name[0]) + (n) + \
		sizeof(xfs_dir2_data_off_t)), XFS_DIR2_DATA_ALIGN)

		#define XFS_DIR3_DATA_ENTSIZE(n) \
		round_up((offsetof(struct xfs_dir2_data_entry, name[0]) + (n) + \
		sizeof(xfs_dir2_data_off_t) + sizeof(uint8_t)), \
		XFS_DIR2_DATA_ALIGN)

		int
		xfs_dir2_data_entsize(
		struct xfs_mount *mp,
		int n)
		{
		if (xfs_sb_version_hasftype(&mp->m_sb))
		return XFS_DIR3_DATA_ENTSIZE(n);
		else
		return XFS_DIR2_DATA_ENTSIZE(n);
		}

		static uint8_t
		xfs_dir2_data_get_ftype(
		struct xfs_dir2_data_entry *dep)

+14 −1

Original line number	Diff line number	Diff line
		@@ -57,7 +57,6 @@ extern int xfs_dir2_leaf_to_block(struct xfs_da_args *args,
		struct xfs_buf lbp, struct xfs_buf dbp);

		/* xfs_dir2_data.c */
		int xfs_dir2_data_entsize(struct xfs_mount *mp, int n);
		__be16 xfs_dir2_data_entry_tag_p(struct xfs_mount mp,
		struct xfs_dir2_data_entry *dep);

		@@ -172,4 +171,18 @@ extern xfs_failaddr_t xfs_dir2_sf_verify(struct xfs_inode *ip);
		extern int xfs_readdir(struct xfs_trans tp, struct xfs_inode dp,
		struct dir_context *ctx, size_t bufsize);

		static inline unsigned int
		xfs_dir2_data_entsize(
		struct xfs_mount *mp,
		unsigned int namelen)
		{
		unsigned int len;

		len = offsetof(struct xfs_dir2_data_entry, name[0]) + namelen +
		sizeof(xfs_dir2_data_off_t) /* tag */;
		if (xfs_sb_version_hasftype(&mp->m_sb))
		len += sizeof(uint8_t);
		return round_up(len, XFS_DIR2_DATA_ALIGN);
		}

		#endif /* __XFS_DIR2_PRIV_H__ */