Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-20 11:01:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

staging: erofs: complete error handing of z_erofs_map_blocks_iter

Browse Source 
This patch completes error handing of z_erofs_map_blocks_iter
and vle_get_logical_extent_head, including no memory and
io error cases.

Reviewed-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Gao Xiang <gaoxiang25@huawei.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Gao Xiang 2018-09-18 22:25:35 +08:00 committed by Greg Kroah-Hartman
parent a07eeddf5b
commit c1ccc8670c
1 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
drivers/staging/erofs/unzip_vle.c
View File

@ -1500,7 +1500,11 @@ vle_get_logical_extent_head(const struct vle_map_blocks_iter_ctx *ctx,
unlock_page(mpage); unlock_page(mpage);
put_page(mpage); put_page(mpage);
mpage = erofs_get_meta_page_nofail(ctx->sb, mblk, false); mpage = erofs_get_meta_page(ctx->sb, mblk, false);
if (IS_ERR(mpage)) {
*ctx->mpage_ret = NULL;
return PTR_ERR(mpage);
}
*ctx->mpage_ret = mpage; *ctx->mpage_ret = mpage;
*ctx->kaddr_ret = kmap_atomic(mpage); *ctx->kaddr_ret = kmap_atomic(mpage);
} }
@ -1511,9 +1515,12 @@ vle_get_logical_extent_head(const struct vle_map_blocks_iter_ctx *ctx,
switch (cluster_type) { switch (cluster_type) {
case Z_EROFS_VLE_CLUSTER_TYPE_NONHEAD: case Z_EROFS_VLE_CLUSTER_TYPE_NONHEAD:
delta0 = le16_to_cpu(di->di_u.delta[0]); delta0 = le16_to_cpu(di->di_u.delta[0]);
DBG_BUGON(!delta0); if (unlikely(!delta0 || delta0 > lcn)) {
DBG_BUGON(lcn < delta0); errln("invalid NONHEAD dl0 %u at lcn %u of nid %llu",
delta0, lcn, EROFS_V(ctx->inode)->nid);
DBG_BUGON(1);
return -EIO;
}
return vle_get_logical_extent_head(ctx, return vle_get_logical_extent_head(ctx,
lcn - delta0, ofs, pblk, flags); lcn - delta0, ofs, pblk, flags);
case Z_EROFS_VLE_CLUSTER_TYPE_PLAIN: case Z_EROFS_VLE_CLUSTER_TYPE_PLAIN:
@ -1526,7 +1533,10 @@ vle_get_logical_extent_head(const struct vle_map_blocks_iter_ctx *ctx,
*pblk = le32_to_cpu(di->di_u.blkaddr); *pblk = le32_to_cpu(di->di_u.blkaddr);
break; break;
default: default:
BUG_ON(1); errln("unknown cluster type %u at lcn %u of nid %llu",
cluster_type, lcn, EROFS_V(ctx->inode)->nid);
DBG_BUGON(1);
return -EIO;
} }
return 0; return 0;
} }
@ -1583,7 +1593,11 @@ int z_erofs_map_blocks_iter(struct inode *inode,
if (mpage != NULL) if (mpage != NULL)
put_page(mpage); put_page(mpage);
mpage = erofs_get_meta_page_nofail(ctx.sb, mblk, false); mpage = erofs_get_meta_page(ctx.sb, mblk, false);
if (IS_ERR(mpage)) {
err = PTR_ERR(mpage);
goto out;
}
*mpage_ret = mpage; *mpage_ret = mpage;
} else { } else {
lock_page(mpage); lock_page(mpage);
@ -1646,8 +1660,11 @@ int z_erofs_map_blocks_iter(struct inode *inode,
&pblk, &map->m_flags); &pblk, &map->m_flags);
mpage = *mpage_ret; mpage = *mpage_ret;
if (unlikely(err)) if (unlikely(err)) {
goto unmap_out; if (mpage)
goto unmap_out;
goto out;
}
break; break;
default: default:
errln("unknown cluster type %u at offset %llu of nid %llu", errln("unknown cluster type %u at offset %llu of nid %llu",
@ -1671,7 +1688,7 @@ out:
map->m_llen, map->m_plen, map->m_flags); map->m_llen, map->m_plen, map->m_flags);
/* aggressively BUG_ON iff CONFIG_EROFS_FS_DEBUG is on */ /* aggressively BUG_ON iff CONFIG_EROFS_FS_DEBUG is on */
DBG_BUGON(err < 0); DBG_BUGON(err < 0 && err != -ENOMEM);
return err; return err;
} }