diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-11-04 11:54:15 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-11-04 11:59:45 +0100 |
| commit | a2e71271535fde493c32803b1f34789f97efcb5e (patch) | |
| tree | 90d7139bea2f49e947f27af92614fa6eca50b64d /fs/hfsplus/wrapper.c | |
| parent | 6d7aa9d721c8c640066142fd9534afcdf68d7f9d (diff) | |
| parent | b419148e567728f6af0c3b01965c1cc141e3e13a (diff) | |
Merge commit 'v2.6.32-rc6' into perf/core
Conflicts:
tools/perf/Makefile
Merge reason: Resolve the conflict, merge to upstream and merge in
perf fixes so we can add a dependent patch.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'fs/hfsplus/wrapper.c')
| -rw-r--r-- | fs/hfsplus/wrapper.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/hfsplus/wrapper.c b/fs/hfsplus/wrapper.c index 175d08eacc8..bed78ac8f6d 100644 --- a/fs/hfsplus/wrapper.c +++ b/fs/hfsplus/wrapper.c @@ -99,6 +99,10 @@ int hfsplus_read_wrapper(struct super_block *sb) if (hfsplus_get_last_session(sb, &part_start, &part_size)) return -EINVAL; + if ((u64)part_start + part_size > 0x100000000ULL) { + pr_err("hfs: volumes larger than 2TB are not supported yet\n"); + return -EINVAL; + } while (1) { bh = sb_bread512(sb, part_start + HFSPLUS_VOLHEAD_SECTOR, vhdr); if (!bh) |