Commit 5a8338c8 authored by Allison Henderson's avatar Allison Henderson Committed by Darrick J. Wong
Browse files

xfs: Add parent pointers to rename 



This patch removes the old parent pointer attribute during the rename
operation, and re-adds the updated parent pointer.

Signed-off-by: default avatarAllison Henderson <allison.henderson@oracle.com>
Reviewed-by: default avatarDarrick J. Wong <djwong@kernel.org>
[djwong: adjust to new ondisk format]
Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
parent d2d18330

fs/xfs/libxfs/xfs_parent.c

+30 −0
Original line number Diff line number Diff line
@@ -227,3 +227,33 @@ xfs_parent_removename( 
	xfs_attr_defer_add(&ppargs->args, XFS_ATTR_DEFER_REMOVE);

	return 0;

}



/* Replace one parent pointer with another to reflect a rename. */

int

xfs_parent_replacename(

	struct xfs_trans	*tp,

	struct xfs_parent_args	*ppargs,

	struct xfs_inode	*old_dp,

	const struct xfs_name	*old_name,

	struct xfs_inode	*new_dp,

	const struct xfs_name	*new_name,

	struct xfs_inode	*child)

{

	int			error;



	error = xfs_parent_iread_extents(tp, child);

	if (error)

		return error;



	xfs_inode_to_parent_rec(&ppargs->rec, old_dp);

	xfs_parent_da_args_init(&ppargs->args, tp, &ppargs->rec, child,

			child->i_ino, old_name);



	xfs_inode_to_parent_rec(&ppargs->new_rec, new_dp);

	ppargs->args.new_name = new_name->name;

	ppargs->args.new_namelen = new_name->len;

	ppargs->args.new_value = &ppargs->new_rec;

	ppargs->args.new_valuelen = sizeof(struct xfs_parent_rec);

	xfs_attr_defer_add(&ppargs->args, XFS_ATTR_DEFER_REPLACE);

	return 0;

}

fs/xfs/libxfs/xfs_parent.h

+6 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ extern struct kmem_cache *xfs_parent_args_cache; 
 */

struct xfs_parent_args {

	struct xfs_parent_rec	rec;

	struct xfs_parent_rec	new_rec;

	struct xfs_da_args	args;

};
@@ -84,5 +85,10 @@ int xfs_parent_addname(struct xfs_trans *tp, struct xfs_parent_args *ppargs, 
int xfs_parent_removename(struct xfs_trans *tp, struct xfs_parent_args *ppargs,

		struct xfs_inode *dp, const struct xfs_name *parent_name,

		struct xfs_inode *child);

int xfs_parent_replacename(struct xfs_trans *tp,

		struct xfs_parent_args *ppargs,

		struct xfs_inode *old_dp, const struct xfs_name *old_name,

		struct xfs_inode *new_dp, const struct xfs_name *new_name,

		struct xfs_inode *child);



#endif /* __XFS_PARENT_H__ */

fs/xfs/libxfs/xfs_trans_space.c

+25 −0
Original line number Diff line number Diff line
@@ -94,3 +94,28 @@ xfs_remove_space_res( 


	return ret;

}



unsigned int

xfs_rename_space_res(

	struct xfs_mount	*mp,

	unsigned int		src_namelen,

	bool			target_exists,

	unsigned int		target_namelen,

	bool			has_whiteout)

{

	unsigned int		ret;



	ret = XFS_DIRREMOVE_SPACE_RES(mp) +

			XFS_DIRENTER_SPACE_RES(mp, target_namelen);



	if (xfs_has_parent(mp)) {

		if (has_whiteout)

			ret += xfs_parent_calc_space_res(mp, src_namelen);

		ret += 2 * xfs_parent_calc_space_res(mp, target_namelen);

	}



	if (target_exists)

		ret += xfs_parent_calc_space_res(mp, target_namelen);



	return ret;

}

fs/xfs/libxfs/xfs_trans_space.h

+4 −2
Original line number Diff line number Diff line
@@ -91,8 +91,6 @@ 
	 XFS_DQUOT_CLUSTER_SIZE_FSB)

#define	XFS_QM_QINOCREATE_SPACE_RES(mp)	\

	XFS_IALLOC_SPACE_RES(mp)

#define	XFS_RENAME_SPACE_RES(mp,nl)	\

	(XFS_DIRREMOVE_SPACE_RES(mp) + XFS_DIRENTER_SPACE_RES(mp,nl))

#define XFS_IFREE_SPACE_RES(mp)		\

	(xfs_has_finobt(mp) ? M_IGEO(mp)->inobt_maxlevels : 0)
@@ -106,4 +104,8 @@ unsigned int xfs_symlink_space_res(struct xfs_mount *mp, unsigned int namelen, 
		unsigned int fsblocks);

unsigned int xfs_remove_space_res(struct xfs_mount *mp, unsigned int namelen);



unsigned int xfs_rename_space_res(struct xfs_mount *mp,

		unsigned int src_namelen, bool target_exists,

		unsigned int target_namelen, bool has_whiteout);



#endif	/* __XFS_TRANS_SPACE_H__ */

fs/xfs/scrub/orphanage.c

+2 −1
Original line number Diff line number Diff line
@@ -328,7 +328,8 @@ xrep_adoption_trans_alloc( 
	adopt->sc = sc;

	adopt->orphanage_blkres = xfs_link_space_res(mp, MAXNAMELEN);

	if (S_ISDIR(VFS_I(sc->ip)->i_mode))

		child_blkres = XFS_RENAME_SPACE_RES(mp, xfs_name_dotdot.len);

		child_blkres = xfs_rename_space_res(mp, 0, false,

						    xfs_name_dotdot.len, false);

	adopt->child_blkres = child_blkres;



	/*