udf: Convert udf_symlink_filler() to use udf_bread()
authorJan Kara <jack@suse.cz>
Wed, 18 Jan 2023 13:32:45 +0000 (14:32 +0100)
committerJan Kara <jack@suse.cz>
Thu, 26 Jan 2023 15:46:33 +0000 (16:46 +0100)
Convert udf_symlink_filler() to use udf_bread() instead of mapping and
reading buffer head manually.

Signed-off-by: Jan Kara <jack@suse.cz>
fs/udf/symlink.c

index 451d6d6c701e36e5c217bc686d859a0217fd8158..a6cabaa5f1c234afef6f283723590291e88262a7 100644 (file)
@@ -107,10 +107,9 @@ static int udf_symlink_filler(struct file *file, struct folio *folio)
        struct inode *inode = page->mapping->host;
        struct buffer_head *bh = NULL;
        unsigned char *symlink;
-       int err;
+       int err = 0;
        unsigned char *p = page_address(page);
        struct udf_inode_info *iinfo = UDF_I(inode);
-       uint32_t pos;
 
        /* We don't support symlinks longer than one block */
        if (inode->i_size > inode->i_sb->s_blocksize) {
@@ -121,14 +120,12 @@ static int udf_symlink_filler(struct file *file, struct folio *folio)
        if (iinfo->i_alloc_type == ICBTAG_FLAG_AD_IN_ICB) {
                symlink = iinfo->i_data + iinfo->i_lenEAttr;
        } else {
-               pos = udf_block_map(inode, 0);
-               bh = sb_bread(inode->i_sb, pos);
-
+               bh = udf_bread(inode, 0, 0, &err);
                if (!bh) {
-                       err = -EIO;
+                       if (!err)
+                               err = -EFSCORRUPTED;
                        goto out_err;
                }
-
                symlink = bh->b_data;
        }