From patchwork Wed May 22 03:16:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 13670326 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 33FD833F9 for ; Wed, 22 May 2024 03:16:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716347817; cv=none; b=o+r3cX/0fA54ZDlcgzGNn80Q1TXkSv/6Eb4ETbmuoi8HARMxTs6LpQYsrTL7OQiof7FPgOxUWjCvnUtf9fSCKdttmAXXZow2lpnT75IBKJnUFTye6ERp0bGWoRIvqYe/e2HFqY8Jzkvaht6stNSogNKv+eZAkkMpAH+wmu7lJvI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716347817; c=relaxed/simple; bh=OkunBPEZ1Y1rrVQD20lLENeYzYwQXc/leW0UV00FEFk=; h=Date:Subject:From:To:Cc:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=BJYgUXhk3FpCZ2a7wNqvvL6d4SQCu9asA8CJnVZx2DvTA8yke+6DioBXaOE1yM/LAeKHilCc73xbhUX81aNXOR7nb99wzwhoCTzjFNHHgymrlruuUo7e1ec8wfORWVjFXebN6pEwqRTv7BIfcqbZOCnuXRpUiq01rQMolT29+s0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=P6eu+p8X; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="P6eu+p8X" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 085F8C2BD11; Wed, 22 May 2024 03:16:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1716347817; bh=OkunBPEZ1Y1rrVQD20lLENeYzYwQXc/leW0UV00FEFk=; h=Date:Subject:From:To:Cc:In-Reply-To:References:From; b=P6eu+p8Xi3DCKh3H8iGRHn/65cZ/SyMfnL4DC+RFXZyGzF/t9cy3p2HPsQkSiINLh WkIXPVcbkCSD2x5Shix/8Oanna4LOKK7WyOunR6/TrqCVTcmNo9GJ3LdfeM0WFQ+O1 l7OdfanY85UZ6sNs647dClUi81nkdHp430/Z5hHGZHGoFl57jBHHcaC8thP+ITVtRQ b2ItaTJbDIll2IWh1UoRwfCt6NumlVX/3iSgZcnhliSndrBRhQRDi2XYCcUAQGMM+1 RzmMcK06MAU9CwWJ78MvE6SOAo1rZNEbG4Vi2lU7hqY8VYzBYiUCinTDDEOuuETVqx tVkOXpnFbWFJg== Date: Tue, 21 May 2024 20:16:56 -0700 Subject: [PATCH 108/111] xfs: move symlink target write function to libxfs From: "Darrick J. Wong" To: djwong@kernel.org, cem@kernel.org Cc: Christoph Hellwig , linux-xfs@vger.kernel.org Message-ID: <171634533323.2478931.4251076159787507429.stgit@frogsfrogsfrogs> In-Reply-To: <171634531590.2478931.8474978645585392776.stgit@frogsfrogsfrogs> References: <171634531590.2478931.8474978645585392776.stgit@frogsfrogsfrogs> User-Agent: StGit/0.19 Precedence: bulk X-Mailing-List: linux-xfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Darrick J. Wong Source kernel commit: b8102b61f7b8929ad8043e4574a1e26276398041 Move xfs_symlink_write_target to xfs_symlink_remote.c so that kernel and mkfs can share the same function. Signed-off-by: Darrick J. Wong Reviewed-by: Christoph Hellwig --- libxfs/xfs_symlink_remote.c | 77 ++++++++++++++++++++++++++++++++++++++++++- libxfs/xfs_symlink_remote.h | 3 ++ 2 files changed, 79 insertions(+), 1 deletion(-) diff --git a/libxfs/xfs_symlink_remote.c b/libxfs/xfs_symlink_remote.c index f2e591ea9..875e03bcb 100644 --- a/libxfs/xfs_symlink_remote.c +++ b/libxfs/xfs_symlink_remote.c @@ -18,7 +18,6 @@ #include "xfs_bmap.h" #include "xfs_health.h" - /* * Each contiguous block has a header, so it is not just a simple pathlen * to FSB conversion. @@ -302,3 +301,79 @@ xfs_symlink_remote_read( out: return error; } + +/* Write the symlink target into the inode. */ +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) +{ + struct xfs_bmbt_irec mval[XFS_SYMLINK_MAPS]; + struct xfs_mount *mp = tp->t_mountp; + const char *cur_chunk; + struct xfs_buf *bp; + xfs_daddr_t d; + int byte_cnt; + int nmaps; + int offset = 0; + int n; + int error; + + /* + * If the symlink will fit into the inode, write it inline. + */ + if (pathlen <= xfs_inode_data_fork_size(ip)) { + xfs_init_local_fork(ip, XFS_DATA_FORK, target_path, pathlen); + + ip->i_disk_size = pathlen; + ip->i_df.if_format = XFS_DINODE_FMT_LOCAL; + xfs_trans_log_inode(tp, ip, XFS_ILOG_DDATA | XFS_ILOG_CORE); + return 0; + } + + nmaps = XFS_SYMLINK_MAPS; + error = xfs_bmapi_write(tp, ip, 0, fs_blocks, XFS_BMAPI_METADATA, + resblks, mval, &nmaps); + if (error) + return error; + + ip->i_disk_size = pathlen; + xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE); + + cur_chunk = target_path; + offset = 0; + for (n = 0; n < nmaps; n++) { + char *buf; + + d = XFS_FSB_TO_DADDR(mp, mval[n].br_startblock); + byte_cnt = XFS_FSB_TO_B(mp, mval[n].br_blockcount); + error = xfs_trans_get_buf(tp, mp->m_ddev_targp, d, + BTOBB(byte_cnt), 0, &bp); + if (error) + return error; + bp->b_ops = &xfs_symlink_buf_ops; + + byte_cnt = XFS_SYMLINK_BUF_SPACE(mp, byte_cnt); + byte_cnt = min(byte_cnt, pathlen); + + buf = bp->b_addr; + buf += xfs_symlink_hdr_set(mp, ip->i_ino, offset, byte_cnt, + bp); + + memcpy(buf, cur_chunk, byte_cnt); + + cur_chunk += byte_cnt; + pathlen -= byte_cnt; + offset += byte_cnt; + + xfs_trans_buf_set_type(tp, bp, XFS_BLFT_SYMLINK_BUF); + xfs_trans_log_buf(tp, bp, 0, (buf + byte_cnt - 1) - + (char *)bp->b_addr); + } + ASSERT(pathlen == 0); + return 0; +} diff --git a/libxfs/xfs_symlink_remote.h b/libxfs/xfs_symlink_remote.h index bb83a8b8d..a63bd38ae 100644 --- a/libxfs/xfs_symlink_remote.h +++ b/libxfs/xfs_symlink_remote.h @@ -19,5 +19,8 @@ void xfs_symlink_local_to_remote(struct xfs_trans *tp, struct xfs_buf *bp, struct xfs_inode *ip, struct xfs_ifork *ifp); 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); #endif /* __XFS_SYMLINK_REMOTE_H */