d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

udf_map: return proper error code instead of leaking an internal one

Browse Source 
Incidentally this also allows for small files with data embedded into
fentry to be mmap-ed.

Approved by: jhb (mentor)
This commit is contained in:
Andriy Gapon 2009-02-26 12:33:17 +00:00
parent be52a95d88
commit 82467096ff
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sys/fs/udf/udf_vnops.c
View File

@ -1056,8 +1056,19 @@ udf_bmap(struct vop_bmap_args *a)
if (a->a_runb)
*a->a_runb = 0;
error = udf_bmap_internal(node, a->a_bn * node->udfmp->bsize, &lsector,
&max_size);
/*
* UDF_INVALID_BMAP means data embedded into fentry, this is an internal
* error that should not be propagated to calling code.
* Most obvious mapping for this error is EOPNOTSUPP as we can not truly
* translate block numbers in this case.
* Incidentally, this return code will make vnode pager to use VOP_READ
* to get data for mmap-ed pages and udf_read knows how to do the right
* thing for this kind of files.
*/
error = udf_bmap_internal(node, a->a_bn << node->udfmp->bshift,
&lsector, &max_size);
if (error == UDF_INVALID_BMAP)
return (EOPNOTSUPP);
if (error)
return (error);