mkfs: use libxfs to create symlinks

Now that we've grabbed the kernel-side symlink writing function, use it
to create symbolic links from protofiles.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>

diff --git a/libxfs/libxfs_api_defs.h b/libxfs/libxfs_api_defs.h
index 2b1a2035c6a2894e9e5faa45762da05fb4b2d27c..16f6513f671e4ef6f86d948a1d4448eddefbbf6c 100644 (file)
--- a/libxfs/libxfs_api_defs.h
+++ b/libxfs/libxfs_api_defs.h
@@ -240,6 +240,7 @@
 #define xfs_sb_version_to_features     libxfs_sb_version_to_features
 #define xfs_symlink_blocks             libxfs_symlink_blocks
 #define xfs_symlink_hdr_ok             libxfs_symlink_hdr_ok
+#define xfs_symlink_write_target       libxfs_symlink_write_target
 
 #define xfs_trans_add_item             libxfs_trans_add_item
 #define xfs_trans_alloc_empty          libxfs_trans_alloc_empty

diff --git a/mkfs/proto.c b/mkfs/proto.c
index 10b929b2ec37d990a51c09e81a94d4feb7257a5f..a923f9c1028b52dbf05d1af43126bd02e39c2218 100644 (file)
--- a/mkfs/proto.c
+++ b/mkfs/proto.c
@@ -16,8 +16,6 @@ static char *getstr(char **pp);
 static void fail(char *msg, int i);
 static struct xfs_trans * getres(struct xfs_mount *mp, uint blocks);
 static void rsvfile(xfs_mount_t *mp, xfs_inode_t *ip, long long len);
-static int newfile(xfs_trans_t *tp, xfs_inode_t *ip, int symlink, int logit,
-                       char *buf, int len);
 static char *newregfile(char **pp, int *len);
 static void rtinit(xfs_mount_t *mp);
 static void rtfreesp_init(struct xfs_mount *mp);
@@ -243,31 +241,42 @@ rsvfile(
                fail(_("committing space for a file failed"), error);
 }
 
-static int
-newfile(
-       xfs_trans_t     *tp,
-       xfs_inode_t     *ip,
-       int             symlink,
-       int             logit,
-       char            *buf,
-       int             len)
+static void
+writesymlink(
+       struct xfs_trans        *tp,
+       struct xfs_inode        *ip,
+       char                    *buf,
+       int                     len)
 {
-       struct xfs_buf  *bp;
-       xfs_daddr_t     d;
-       int             error;
-       int             flags;
-       xfs_bmbt_irec_t map;
-       xfs_mount_t     *mp;
-       xfs_extlen_t    nb;
-       int             nmap;
+       struct xfs_mount        *mp = tp->t_mountp;
+       xfs_extlen_t            nb = XFS_B_TO_FSB(mp, len);
+       int                     error;
+
+       error = -libxfs_symlink_write_target(tp, ip, buf, len, nb, nb);
+       if (error) {
+               fprintf(stderr,
+       _("%s: error %d creating symlink to '%s'.\n"), progname, error, buf);
+               exit(1);
+       }
+}
+
+static void
+writefile(
+       struct xfs_trans        *tp,
+       struct xfs_inode        *ip,
+       char                    *buf,
+       int                     len)
+{
+       struct xfs_bmbt_irec    map;
+       struct xfs_mount        *mp;
+       struct xfs_buf          *bp;
+       xfs_daddr_t             d;
+       xfs_extlen_t            nb;
+       int                     nmap;
+       int                     error;
 
-       flags = 0;
        mp = ip->i_mount;
-       if (symlink && len <= xfs_inode_data_fork_size(ip)) {
-               libxfs_init_local_fork(ip, XFS_DATA_FORK, buf, len);
-               ip->i_df.if_format = XFS_DINODE_FMT_LOCAL;
-               flags = XFS_ILOG_DDATA;
-       } else if (len > 0) {
+       if (len > 0) {
                int     bcount;
 
                nb = XFS_B_TO_FSB(mp, len);
@@ -289,7 +298,7 @@ newfile(
                        exit(1);
                }
                d = XFS_FSB_TO_DADDR(mp, map.br_startblock);
-               error = -libxfs_trans_get_buf(logit ? tp : NULL, mp->m_dev, d,
+               error = -libxfs_trans_get_buf(NULL, mp->m_dev, d,
                                nb << mp->m_blkbb_log, 0, &bp);
                if (error) {
                        fprintf(stderr,
@@ -301,15 +310,10 @@ newfile(
                bcount = BBTOB(bp->b_length);
                if (len < bcount)
                        memset((char *)bp->b_addr + len, 0, bcount - len);
-               if (logit)
-                       libxfs_trans_log_buf(tp, bp, 0, bcount - 1);
-               else {
-                       libxfs_buf_mark_dirty(bp);
-                       libxfs_buf_relse(bp);
-               }
+               libxfs_buf_mark_dirty(bp);
+               libxfs_buf_relse(bp);
        }
        ip->i_disk_size = len;
-       return flags;
 }
 
 static char *
@@ -491,7 +495,7 @@ parseproto(
                                           &creds, fsxp, &ip);
                if (error)
                        fail(_("Inode allocation failed"), error);
-               flags |= newfile(tp, ip, 0, 0, buf, len);
+               writefile(tp, ip, buf, len);
                if (buf)
                        free(buf);
                libxfs_trans_ijoin(tp, pip, 0);
@@ -575,7 +579,7 @@ parseproto(
                                &creds, fsxp, &ip);
                if (error)
                        fail(_("Inode allocation failed"), error);
-               flags |= newfile(tp, ip, 1, 1, buf, len);
+               writesymlink(tp, ip, buf, len);
                libxfs_trans_ijoin(tp, pip, 0);
                xname.type = XFS_DIR3_FT_SYMLINK;
                newdirent(mp, tp, pip, &xname, ip->i_ino);