Commit 541e047b authored by Jan Kara's avatar Jan Kara

udf: Use udf_map_block() in udf_getblk()

Use the new function udf_map_block() in udf_getblk().
Signed-off-by: default avatarJan Kara <jack@suse.cz>
parent 80942521
...@@ -405,14 +405,15 @@ static struct buffer_head *udf_getblk(struct inode *inode, udf_pblk_t block, ...@@ -405,14 +405,15 @@ static struct buffer_head *udf_getblk(struct inode *inode, udf_pblk_t block,
int create, int *err) int create, int *err)
{ {
struct buffer_head *bh; struct buffer_head *bh;
struct buffer_head dummy; struct udf_map_rq map = {
.lblk = block,
dummy.b_state = 0; .iflags = UDF_MAP_NOPREALLOC | (create ? UDF_MAP_CREATE : 0),
dummy.b_blocknr = -1000; };
*err = udf_get_block(inode, block, &dummy, create);
if (!*err && buffer_mapped(&dummy)) { *err = udf_map_block(inode, &map);
bh = sb_getblk(inode->i_sb, dummy.b_blocknr); if (!*err && map.oflags & UDF_BLK_MAPPED) {
if (buffer_new(&dummy)) { bh = sb_getblk(inode->i_sb, map.pblk);
if (map.oflags & UDF_BLK_NEW) {
lock_buffer(bh); lock_buffer(bh);
memset(bh->b_data, 0x00, inode->i_sb->s_blocksize); memset(bh->b_data, 0x00, inode->i_sb->s_blocksize);
set_buffer_uptodate(bh); set_buffer_uptodate(bh);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment