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

xfs: pass the owner to xfs_symlink_write_target 



Require callers of xfs_symlink_write_target to pass the owner number
explicitly.  This sets us up for online repair to be able to write a
remote symlink target to sc->tempip with sc->ip's inumber in the block
heaader.

Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
parent ef744be4

fs/xfs/libxfs/xfs_symlink_remote.c

+2 −2
Original line number Diff line number Diff line
@@ -311,6 +311,7 @@ int 
xfs_symlink_write_target(

	struct xfs_trans	*tp,

	struct xfs_inode	*ip,

	xfs_ino_t		owner,

	const char		*target_path,

	int			pathlen,

	xfs_fsblock_t		fs_blocks,
@@ -365,8 +366,7 @@ xfs_symlink_write_target( 
		byte_cnt = min(byte_cnt, pathlen);



		buf = bp->b_addr;

		buf += xfs_symlink_hdr_set(mp, ip->i_ino, offset, byte_cnt,

				bp);

		buf += xfs_symlink_hdr_set(mp, owner, offset, byte_cnt, bp);



		memcpy(buf, cur_chunk, byte_cnt);

fs/xfs/libxfs/xfs_symlink_remote.h

+2 −2
Original line number Diff line number Diff line
@@ -21,8 +21,8 @@ void xfs_symlink_local_to_remote(struct xfs_trans *tp, struct xfs_buf *bp, 
xfs_failaddr_t xfs_symlink_shortform_verify(void *sfp, int64_t size);

int xfs_symlink_remote_read(struct xfs_inode *ip, char *link);

int xfs_symlink_write_target(struct xfs_trans *tp, struct xfs_inode *ip,

		const char *target_path, int pathlen, xfs_fsblock_t fs_blocks,

		uint resblks);

		xfs_ino_t owner, const char *target_path, int pathlen,

		xfs_fsblock_t fs_blocks, uint resblks);

int xfs_symlink_remote_truncate(struct xfs_trans *tp, struct xfs_inode *ip);



#endif /* __XFS_SYMLINK_REMOTE_H */

fs/xfs/xfs_symlink.c

+2 −2
Original line number Diff line number Diff line
@@ -181,8 +181,8 @@ xfs_symlink( 
	xfs_qm_vop_create_dqattach(tp, ip, udqp, gdqp, pdqp);



	resblks -= XFS_IALLOC_SPACE_RES(mp);

	error = xfs_symlink_write_target(tp, ip, target_path, pathlen,

			fs_blocks, resblks);

	error = xfs_symlink_write_target(tp, ip, ip->i_ino, target_path,

			pathlen, fs_blocks, resblks);

	if (error)

		goto out_trans_cancel;

	resblks -= fs_blocks;