From 2bfa1e2a340fe6f583de0076749c59dfad43404e Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Wed, 16 Feb 2011 09:34:22 +0100 Subject: [PATCH] --- yaml --- r: 255101 b: refs/heads/master c: 4ba2d5fdcfd19de0dedf394ddc48db2f219fa89a h: refs/heads/master i: 255099: e3e2dc8f9f58d32f000a7d23fb5c0db772e2a42b v: v3 --- [refs] | 2 +- trunk/fs/hfsplus/wrapper.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 58a486fd8d2e..967b04c1a263 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bf1a1b31fa3ea24e3a90821d69a5c3da066f7d6c +refs/heads/master: 4ba2d5fdcfd19de0dedf394ddc48db2f219fa89a diff --git a/trunk/fs/hfsplus/wrapper.c b/trunk/fs/hfsplus/wrapper.c index 4ac88ff79aa6..4b86468125c1 100644 --- a/trunk/fs/hfsplus/wrapper.c +++ b/trunk/fs/hfsplus/wrapper.c @@ -172,8 +172,9 @@ int hfsplus_read_wrapper(struct super_block *sb) if (!hfsplus_read_mdb(sbi->s_vhdr, &wd)) 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; + part_start += (sector_t)wd.ablk_start + + (sector_t)wd.embed_start * wd.ablk_size; + part_size = (sector_t)wd.embed_count * wd.ablk_size; goto reread; default: /*