From c5cf78c5d2a7f4dc7c474c44f6a35169aaffc578 Mon Sep 17 00:00:00 2001 From: Chuck Ebbert Date: Wed, 2 Feb 2011 10:55:06 -0500 Subject: [PATCH] --- yaml --- r: 232795 b: refs/heads/master c: a1dbcef0172555464b5329f8ba47d43c98132dfa h: refs/heads/master i: 232793: 3a7d0f3323db837298219e0bcbc22814d1a4a008 232791: 8e1a4b11f161b29340c343dec5de1478fdf209f0 v: v3 --- [refs] | 2 +- trunk/fs/hfsplus/wrapper.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f477823b10a0..6eeb781868bc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 14dd01f88319a37b06ca909738044e39ec5bfdee +refs/heads/master: a1dbcef0172555464b5329f8ba47d43c98132dfa diff --git a/trunk/fs/hfsplus/wrapper.c b/trunk/fs/hfsplus/wrapper.c index 196231794f64..3031d81f5f0f 100644 --- a/trunk/fs/hfsplus/wrapper.c +++ b/trunk/fs/hfsplus/wrapper.c @@ -167,7 +167,7 @@ int hfsplus_read_wrapper(struct super_block *sb) break; case cpu_to_be16(HFSP_WRAP_MAGIC): if (!hfsplus_read_mdb(sbi->s_vhdr, &wd)) - goto out; + goto out_free_backup_vhdr; wd.ablk_size >>= HFSPLUS_SECTOR_SHIFT; part_start += wd.ablk_start + wd.embed_start * wd.ablk_size; part_size = wd.embed_count * wd.ablk_size; @@ -179,7 +179,7 @@ int hfsplus_read_wrapper(struct super_block *sb) * (should do this only for cdrom/loop though) */ if (hfs_part_find(sb, &part_start, &part_size)) - goto out; + goto out_free_backup_vhdr; goto reread; }