From: Jan Kara <jack@suse.cz>
Date: Wed, 18 Jan 2023 14:30:06 +0000 (+0100)
Subject: udf: Use udf_map_block() in udf_getblk()
X-Git-Tag: io_uring-6.3-2023-03-03~63^2~30
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=541e047b14c8f07de05262fce948ee7667117986;p=linux-2.6-block.git

udf: Use udf_map_block() in udf_getblk()

Use the new function udf_map_block() in udf_getblk().

Signed-off-by: Jan Kara <jack@suse.cz>
---

diff --git a/fs/udf/inode.c b/fs/udf/inode.c
index 1a6627c91bd8..d3877a356715 100644
--- a/fs/udf/inode.c
+++ b/fs/udf/inode.c
@@ -405,14 +405,15 @@ static struct buffer_head *udf_getblk(struct inode *inode, udf_pblk_t block,
 				      int create, int *err)
 {
 	struct buffer_head *bh;
-	struct buffer_head dummy;
-
-	dummy.b_state = 0;
-	dummy.b_blocknr = -1000;
-	*err = udf_get_block(inode, block, &dummy, create);
-	if (!*err && buffer_mapped(&dummy)) {
-		bh = sb_getblk(inode->i_sb, dummy.b_blocknr);
-		if (buffer_new(&dummy)) {
+	struct udf_map_rq map = {
+		.lblk = block,
+		.iflags = UDF_MAP_NOPREALLOC | (create ? UDF_MAP_CREATE : 0),
+	};
+
+	*err = udf_map_block(inode, &map);
+	if (!*err && map.oflags & UDF_BLK_MAPPED) {
+		bh = sb_getblk(inode->i_sb, map.pblk);
+		if (map.oflags & UDF_BLK_NEW) {
 			lock_buffer(bh);
 			memset(bh->b_data, 0x00, inode->i_sb->s_blocksize);
 			set_buffer_uptodate(bh);