summaryrefslogtreecommitdiff
path: root/fs/udf
diff options
context:
space:
mode:
authorJan Kara <jack@suse.cz>2023-01-18 17:30:06 +0300
committerJan Kara <jack@suse.cz>2023-01-26 18:46:33 +0300
commit541e047b14c8f07de05262fce948ee7667117986 (patch)
tree647879bd6a87f27d0f7c62b41f8e041f9e21ae36 /fs/udf
parent809425217805c2866a7a3019eeff92312edbd7e8 (diff)
downloadlinux-541e047b14c8f07de05262fce948ee7667117986.tar.xz
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>
Diffstat (limited to 'fs/udf')
-rw-r--r--fs/udf/inode.c17
1 files changed, 9 insertions, 8 deletions
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);