Commit 996b2329 authored by Darrick J. Wong's avatar Darrick J. Wong
Browse files

xfs: constify the name argument to various directory functions 



Various directory functions do not modify their @name parameter,
so mark it const to make that clear.  This will enable us to mark
the global xfs_name_dotdot variable as const to prevent mischief.

Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
parent 41667260

fs/xfs/libxfs/xfs_dir2.c

+15 −15
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ xfs_mode_to_ftype( 
 */

xfs_dahash_t

xfs_ascii_ci_hashname(

	struct xfs_name	*name)

	const struct xfs_name	*name)

{

	xfs_dahash_t		hash;

	int			i;
@@ -243,7 +243,7 @@ int 
xfs_dir_createname(

	struct xfs_trans	*tp,

	struct xfs_inode	*dp,

	struct xfs_name		*name,

	const struct xfs_name	*name,

	xfs_ino_t		inum,		/* new entry inode number */

	xfs_extlen_t		total)		/* bmap's total block count */

{
@@ -337,9 +337,9 @@ xfs_dir_cilookup_result( 


int

xfs_dir_lookup(

	xfs_trans_t	*tp,

	xfs_inode_t	*dp,

	struct xfs_name	*name,

	struct xfs_trans	*tp,

	struct xfs_inode	*dp,

	const struct xfs_name	*name,

	xfs_ino_t		*inum,	  /* out: inode number */

	struct xfs_name		*ci_name) /* out: actual name if CI match */

{
@@ -475,7 +475,7 @@ int 
xfs_dir_replace(

	struct xfs_trans	*tp,

	struct xfs_inode	*dp,

	struct xfs_name		*name,		/* name of entry to replace */

	const struct xfs_name	*name,		/* name of entry to replace */

	xfs_ino_t		inum,		/* new inode number */

	xfs_extlen_t		total)		/* bmap's total block count */

{
@@ -728,7 +728,7 @@ xfs_dir2_namecheck( 
xfs_dahash_t

xfs_dir2_hashname(

	struct xfs_mount	*mp,

	struct xfs_name		*name)

	const struct xfs_name	*name)

{

	if (unlikely(xfs_has_asciici(mp)))

		return xfs_ascii_ci_hashname(name);

fs/xfs/libxfs/xfs_dir2.h

+3 −3
Original line number Diff line number Diff line
@@ -39,16 +39,16 @@ extern int xfs_dir_isempty(struct xfs_inode *dp); 
extern int xfs_dir_init(struct xfs_trans *tp, struct xfs_inode *dp,

				struct xfs_inode *pdp);

extern int xfs_dir_createname(struct xfs_trans *tp, struct xfs_inode *dp,

				struct xfs_name *name, xfs_ino_t inum,

				const struct xfs_name *name, xfs_ino_t inum,

				xfs_extlen_t tot);

extern int xfs_dir_lookup(struct xfs_trans *tp, struct xfs_inode *dp,

				struct xfs_name *name, xfs_ino_t *inum,

				const struct xfs_name *name, xfs_ino_t *inum,

				struct xfs_name *ci_name);

extern int xfs_dir_removename(struct xfs_trans *tp, struct xfs_inode *dp,

				struct xfs_name *name, xfs_ino_t ino,

				xfs_extlen_t tot);

extern int xfs_dir_replace(struct xfs_trans *tp, struct xfs_inode *dp,

				struct xfs_name *name, xfs_ino_t inum,

				const struct xfs_name *name, xfs_ino_t inum,

				xfs_extlen_t tot);

extern int xfs_dir_canenter(struct xfs_trans *tp, struct xfs_inode *dp,

				struct xfs_name *name);

fs/xfs/libxfs/xfs_dir2_priv.h

+3 −2
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ struct xfs_dir3_icfree_hdr { 
};



/* xfs_dir2.c */

xfs_dahash_t xfs_ascii_ci_hashname(struct xfs_name *name);

xfs_dahash_t xfs_ascii_ci_hashname(const struct xfs_name *name);

enum xfs_dacmp xfs_ascii_ci_compname(struct xfs_da_args *args,

		const unsigned char *name, int len);

extern int xfs_dir2_grow_inode(struct xfs_da_args *args, int space,
@@ -201,7 +201,8 @@ xfs_dir2_data_entsize( 
	return round_up(len, XFS_DIR2_DATA_ALIGN);

}



xfs_dahash_t xfs_dir2_hashname(struct xfs_mount *mp, struct xfs_name *name);

xfs_dahash_t xfs_dir2_hashname(struct xfs_mount *mp,

		const struct xfs_name *name);

enum xfs_dacmp xfs_dir2_compname(struct xfs_da_args *args,

		const unsigned char *name, int len);

fs/xfs/xfs_inode.c

+3 −3
Original line number Diff line number Diff line
@@ -658,9 +658,9 @@ xfs_ip2xflags( 
 */

int

xfs_lookup(

	xfs_inode_t		*dp,

	struct xfs_name		*name,

	xfs_inode_t		**ipp,

	struct xfs_inode	*dp,

	const struct xfs_name	*name,

	struct xfs_inode	**ipp,

	struct xfs_name		*ci_name)

{

	xfs_ino_t		inum;

fs/xfs/xfs_inode.h

+1 −1
Original line number Diff line number Diff line
@@ -402,7 +402,7 @@ enum layout_break_reason { 


int		xfs_release(struct xfs_inode *ip);

void		xfs_inactive(struct xfs_inode *ip);

int		xfs_lookup(struct xfs_inode *dp, struct xfs_name *name,

int		xfs_lookup(struct xfs_inode *dp, const struct xfs_name *name,

			   struct xfs_inode **ipp, struct xfs_name *ci_name);

int		xfs_create(struct user_namespace *mnt_userns,

			   struct xfs_inode *dp, struct xfs_name *name,