xfs: condense symbolic links after a mapping exchange operation

Source kernel commit: 33a9be2b7016e79f47c4c1b523a0aa59d41893c0

The previous commit added a new file mapping exchange flag that enables
us to perform post-exchange processing on file2 once we're done
exchanging the extent mappings.  Now add this ability for symlinks.

This isn't used anywhere right now, but we need to have the basic ondisk
flags in place so that a future online symlink repair feature can
salvage the remote target in a temporary link and exchange the data fork
mappings when ready.  If one file is in extents format and the other is
inline, we will have to promote both to extents format to perform the
exchange.  After the exchange, we can try to condense the fixed symlink
down to inline format if possible.

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

diff --git a/libxfs/xfs_exchmaps.c b/libxfs/xfs_exchmaps.c
index 6e758cac10622cc46438054a7baece12cac01b3e..34ac9d5f26e01e38cb41d7f16b93d8ce2a0e45bb 100644 (file)
--- a/libxfs/xfs_exchmaps.c
+++ b/libxfs/xfs_exchmaps.c
@@ -27,6 +27,7 @@
 #include "xfs_attr.h"
 #include "xfs_dir2_priv.h"
 #include "xfs_dir2.h"
+#include "xfs_symlink_remote.h"
 
 struct kmem_cache      *xfs_exchmaps_intent_cache;
 
@@ -430,6 +431,49 @@ xfs_exchmaps_dir_to_sf(
        return xfs_dir2_block_to_sf(&args, bp, size, &sfh);
 }
 
+/* Convert inode2's remote symlink target back to shortform, if possible. */
+STATIC int
+xfs_exchmaps_link_to_sf(
+       struct xfs_trans                *tp,
+       struct xfs_exchmaps_intent      *xmi)
+{
+       struct xfs_inode                *ip = xmi->xmi_ip2;
+       struct xfs_ifork                *ifp = xfs_ifork_ptr(ip, XFS_DATA_FORK);
+       char                            *buf;
+       int                             error;
+
+       if (ifp->if_format == XFS_DINODE_FMT_LOCAL ||
+           ip->i_disk_size > xfs_inode_data_fork_size(ip))
+               return 0;
+
+       /* Read the current symlink target into a buffer. */
+       buf = kmalloc(ip->i_disk_size + 1,
+                       GFP_KERNEL | __GFP_NOLOCKDEP | __GFP_NOFAIL);
+       if (!buf) {
+               ASSERT(0);
+               return -ENOMEM;
+       }
+
+       error = xfs_symlink_remote_read(ip, buf);
+       if (error)
+               goto free;
+
+       /* Remove the blocks. */
+       error = xfs_symlink_remote_truncate(tp, ip);
+       if (error)
+               goto free;
+
+       /* Convert fork to local format and log our changes. */
+       xfs_idestroy_fork(ifp);
+       ifp->if_bytes = 0;
+       ifp->if_format = XFS_DINODE_FMT_LOCAL;
+       xfs_init_local_fork(ip, XFS_DATA_FORK, buf, ip->i_disk_size);
+       xfs_trans_log_inode(tp, ip, XFS_ILOG_DDATA | XFS_ILOG_CORE);
+free:
+       kfree(buf);
+       return error;
+}
+
 /* Clear the reflink flag after an exchange. */
 static inline void
 xfs_exchmaps_clear_reflink(
@@ -455,6 +499,8 @@ xfs_exchmaps_do_postop_work(
                        error = xfs_exchmaps_attr_to_sf(tp, xmi);
                else if (S_ISDIR(VFS_I(xmi->xmi_ip2)->i_mode))
                        error = xfs_exchmaps_dir_to_sf(tp, xmi);
+               else if (S_ISLNK(VFS_I(xmi->xmi_ip2)->i_mode))
+                       error = xfs_exchmaps_link_to_sf(tp, xmi);
                xmi->xmi_flags &= ~__XFS_EXCHMAPS_INO2_SHORTFORM;
                if (error)
                        return error;
@@ -919,7 +965,8 @@ xfs_exchmaps_init_intent(
                        xmi->xmi_flags |= XFS_EXCHMAPS_CLEAR_INO2_REFLINK;
        }
 
-       if (S_ISDIR(VFS_I(xmi->xmi_ip2)->i_mode))
+       if (S_ISDIR(VFS_I(xmi->xmi_ip2)->i_mode) ||
+           S_ISLNK(VFS_I(xmi->xmi_ip2)->i_mode))
                xmi->xmi_flags |= __XFS_EXCHMAPS_INO2_SHORTFORM;
 
        return xmi;

diff --git a/libxfs/xfs_symlink_remote.c b/libxfs/xfs_symlink_remote.c
index 875e03bcbc9048934cbca56bafaf4369da25cae5..72f175990f636e93b912d121bd1bddf5af518ef9 100644 (file)
--- a/libxfs/xfs_symlink_remote.c
+++ b/libxfs/xfs_symlink_remote.c
@@ -377,3 +377,50 @@ xfs_symlink_write_target(
        ASSERT(pathlen == 0);
        return 0;
 }
+
+/* Remove all the blocks from a symlink and invalidate buffers. */
+int
+xfs_symlink_remote_truncate(
+       struct xfs_trans        *tp,
+       struct xfs_inode        *ip)
+{
+       struct xfs_bmbt_irec    mval[XFS_SYMLINK_MAPS];
+       struct xfs_mount        *mp = tp->t_mountp;
+       struct xfs_buf          *bp;
+       int                     nmaps = XFS_SYMLINK_MAPS;
+       int                     done = 0;
+       int                     i;
+       int                     error;
+
+       /* Read mappings and invalidate buffers. */
+       error = xfs_bmapi_read(ip, 0, XFS_MAX_FILEOFF, mval, &nmaps, 0);
+       if (error)
+               return error;
+
+       for (i = 0; i < nmaps; i++) {
+               if (!xfs_bmap_is_real_extent(&mval[i]))
+                       break;
+
+               error = xfs_trans_get_buf(tp, mp->m_ddev_targp,
+                               XFS_FSB_TO_DADDR(mp, mval[i].br_startblock),
+                               XFS_FSB_TO_BB(mp, mval[i].br_blockcount), 0,
+                               &bp);
+               if (error)
+                       return error;
+
+               xfs_trans_binval(tp, bp);
+       }
+
+       /* Unmap the remote blocks. */
+       error = xfs_bunmapi(tp, ip, 0, XFS_MAX_FILEOFF, 0, nmaps, &done);
+       if (error)
+               return error;
+       if (!done) {
+               ASSERT(done);
+               xfs_inode_mark_sick(ip, XFS_SICK_INO_SYMLINK);
+               return -EFSCORRUPTED;
+       }
+
+       xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE);
+       return 0;
+}

diff --git a/libxfs/xfs_symlink_remote.h b/libxfs/xfs_symlink_remote.h
index a63bd38ae4faf463876b2954c851cb2f1c0a3467..ac3dac8f617ed063c6e14a5353e347b916a42b45 100644 (file)
--- a/libxfs/xfs_symlink_remote.h
+++ b/libxfs/xfs_symlink_remote.h
@@ -22,5 +22,6 @@ 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);
+int xfs_symlink_remote_truncate(struct xfs_trans *tp, struct xfs_inode *ip);
 
 #endif /* __XFS_SYMLINK_REMOTE_H */