[PATCH 2/3] udf: Use IS_ERR when loading metadata mirror file entry

From	Alden Tondettar <alden.tondettar@gmail.com>
Newsgroups	linux.kernel
Subject	[PATCH 2/3] udf: Use IS_ERR when loading metadata mirror file entry
Date	2016-05-18 23:20 +0200
Message-ID	<rAh2N-7md-5@gated-at.bofh.it> (permalink)
References	<rAh2N-7md-7@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

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>
---
 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

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH 2/3] udf: Use IS_ERR when loading metadata mirror file entry Alden Tondettar <alden.tondettar@gmail.com> - 2016-05-18 23:20 +0200
  Re: [PATCH 2/3] udf: Use IS_ERR when loading metadata mirror file  entry Jan Kara <jack@suse.cz> - 2016-05-19 12:30 +0200

csiph-web