Remove open coding in erofs_fill_symlink.

Suggested-by: Al Viro <[email protected]>
Link: https://lore.kernel.org/all/20240425222847.GN2118490@ZenIV
Signed-off-by: Yiyang Wu <[email protected]>
---
 fs/erofs/inode.c | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/fs/erofs/inode.c b/fs/erofs/inode.c
index 419432be3223..40d3f4921d81 100644
--- a/fs/erofs/inode.c
+++ b/fs/erofs/inode.c
@@ -179,7 +179,6 @@ static int erofs_fill_symlink(struct inode *inode, void 
*kaddr,
 {
        struct erofs_inode *vi = EROFS_I(inode);
        unsigned int bsz = i_blocksize(inode);
-       char *lnk;
 
        /* if it cannot be handled with fast symlink scheme */
        if (vi->datalayout != EROFS_INODE_FLAT_INLINE ||
@@ -188,24 +187,19 @@ static int erofs_fill_symlink(struct inode *inode, void 
*kaddr,
                return 0;
        }
 
-       lnk = kmalloc(inode->i_size + 1, GFP_KERNEL);
-       if (!lnk)
-               return -ENOMEM;
-
        m_pofs += vi->xattr_isize;
        /* inline symlink data shouldn't cross block boundary */
        if (m_pofs + inode->i_size > bsz) {
-               kfree(lnk);
-               erofs_err(inode->i_sb,
-                         "inline data cross block boundary @ nid %llu",
+               erofs_err(inode->i_sb, "inline data cross block boundary @ nid 
%llu",
                          vi->nid);
                DBG_BUGON(1);
                return -EFSCORRUPTED;
        }
-       memcpy(lnk, kaddr + m_pofs, inode->i_size);
-       lnk[inode->i_size] = '\0';
+       
+       inode->i_link = kmemdup_nul(kaddr + m_pofs, inode->i_size, GFP_KERNEL);
+       if (!inode->i_link)
+               return -ENOMEM;
 
-       inode->i_link = lnk;
        inode->i_op = &erofs_fast_symlink_iops;
        return 0;
 }
-- 
2.46.0

Reply via email to