diff mbox series

[08/22] udf: Convert udf_symlink_filler() to use udf_bread()

Message ID 20230124121814.25951-8-jack@suse.cz (mailing list archive)
State New, archived
Headers show
Series udf: Fix couple of preallocation related bugs | expand

Commit Message

Jan Kara Jan. 24, 2023, 12:17 p.m. UTC 
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 | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)
diff mbox series

Patch

diff --git a/fs/udf/symlink.c b/fs/udf/symlink.c
index 451d6d6c701e..a6cabaa5f1c2 100644
--- a/fs/udf/symlink.c
+++ b/fs/udf/symlink.c
@@ -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;
 	}