lkml.org 
[lkml]   [2016]   [May]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 2/3] udf: Use IS_ERR when loading metadata mirror file entry
On Wed 18-05-16 14:09:18, Alden Tondettar wrote:
> Currently when udf_get_pblock_meta25() fails to map a block using the
> primary metadata file, it will attempt to load the mirror file entry by
> calling udf_find_metadata_inode_efe(). That function will return a ERR_PTR
> if it fails, but the return value is only checked against NULL. Test the
> return value using IS_ERR() and change it to NULL if needed.
>
> Signed-off-by: Alden Tondettar <alden.tondettar@gmail.com>

Thanks. I have added this patch to my tree.

Honza

> ---
> fs/udf/partition.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/fs/udf/partition.c b/fs/udf/partition.c
> index e4e9e70..ca3cde3 100644
> --- a/fs/udf/partition.c
> +++ b/fs/udf/partition.c
> @@ -326,6 +326,8 @@ uint32_t udf_get_pblock_meta25(struct super_block *sb, uint32_t block,
> if (!(mdata->s_flags & MF_MIRROR_FE_LOADED)) {
> mdata->s_mirror_fe = udf_find_metadata_inode_efe(sb,
> mdata->s_mirror_file_loc, map->s_partition_num);
> + if (IS_ERR(mdata->s_mirror_fe))
> + mdata->s_mirror_fe = NULL;
> mdata->s_flags |= MF_MIRROR_FE_LOADED;
> }
>
> --
> 2.1.4
>
>
--
Jan Kara <jack@suse.com>
SUSE Labs, CR

\
 
 \ /
  Last update: 2016-05-19 12:41    [W:0.068 / U:1.184 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site