[haiku-commits] haiku: hrev44032 - src/add-ons/kernel/file_systems/iso9660
- From: axeld@xxxxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sun, 15 Apr 2012 13:32:37 +0200 (CEST)
hrev44032 adds 1 changeset to branch 'master'
old head: 3af8da0ef834b67f74f197291fe581f8076d9750
new head: 6ea60bcdbaf07b400adb1de971c3562d15f55668
----------------------------------------------------------------------------
6ea60bc: This must be a 64 bit computation for disks larger than 4GB.
* This closes ticket #8460.
* Patch from jahaiku, thanks!
[ Axel Dörfler <axeld@xxxxxxxxxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev44032
Commit: 6ea60bcdbaf07b400adb1de971c3562d15f55668
URL: http://cgit.haiku-os.org/haiku/commit/?id=6ea60bc
Author: Axel Dörfler <axeld@xxxxxxxxxxxxxxxx>
Date: Sun Apr 15 11:28:16 2012 UTC
Ticket: https://dev.haiku-os.org/ticket/8460
----------------------------------------------------------------------------
1 files changed, 4 insertions(+), 4 deletions(-)
.../file_systems/iso9660/kernel_interface.cpp | 8 ++++----
----------------------------------------------------------------------------
diff --git a/src/add-ons/kernel/file_systems/iso9660/kernel_interface.cpp
b/src/add-ons/kernel/file_systems/iso9660/kernel_interface.cpp
index abcc896..4ed83b5 100644
--- a/src/add-ons/kernel/file_systems/iso9660/kernel_interface.cpp
+++ b/src/add-ons/kernel/file_systems/iso9660/kernel_interface.cpp
@@ -65,8 +65,8 @@ iterative_io_get_vecs_hook(void* cookie, io_request* request,
off_t offset,
{
iso9660_inode* node = (iso9660_inode*)cookie;
- vecs->offset = offset + node->startLBN[FS_DATA_FORMAT]
- * node->volume->logicalBlkSize[FS_DATA_FORMAT];
+ vecs->offset = offset + ((off_t)node->startLBN[FS_DATA_FORMAT]
+ * (off_t)node->volume->logicalBlkSize[FS_DATA_FORMAT]);
vecs->length = size;
*_count = 1;
@@ -439,8 +439,8 @@ fs_read_pages(fs_volume* _volume, fs_vnode* _node, void*
_cookie, off_t pos,
}
file_io_vec fileVec;
- fileVec.offset = pos + node->startLBN[FS_DATA_FORMAT]
- * volume->logicalBlkSize[FS_DATA_FORMAT];
+ fileVec.offset = pos + ((off_t)node->startLBN[FS_DATA_FORMAT]
+ * (off_t)volume->logicalBlkSize[FS_DATA_FORMAT]);
fileVec.length = bytesLeft;
uint32 vecIndex = 0;
Other related posts:
- » [haiku-commits] haiku: hrev44032 - src/add-ons/kernel/file_systems/iso9660 - axeld
