From 97f9cd98b8ae4515ed9fd25c6dd9605ba649d054 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sun, 19 Jan 2003 23:03:44 +0000 Subject: [PATCH] get_buffer() has been changed to use partition-relative offsets. git-svn-id: file:///srv/svn/repos/haiku/trunk/current@2514 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/kernel/disk_scanner/fs/bfs.c | 4 +--- src/add-ons/kernel/disk_scanner/fs/iso9660.c | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/add-ons/kernel/disk_scanner/fs/bfs.c b/src/add-ons/kernel/disk_scanner/fs/bfs.c index 359f5f4683..acd7c4d1be 100644 --- a/src/add-ons/kernel/disk_scanner/fs/bfs.c +++ b/src/add-ons/kernel/disk_scanner/fs/bfs.c @@ -23,7 +23,6 @@ const char *kModuleDebugName = "fs/bfs"; //#define TRACE(x) dprintf x // prototypes -//static status_t read_block(int fd, off_t offset, size_t size, uchar **block); static bool bfs_fs_identify(int deviceFD, struct extended_partition_info *partitionInfo, float *priority, fs_get_buffer get_buffer, struct fs_buffer_cache *cache); @@ -181,8 +180,7 @@ bfs_fs_identify(int deviceFD, struct extended_partition_info *partitionInfo, if (partitionInfo) { uchar *buffer = NULL; disk_super_block *superBlock = NULL; - status_t error = read_block(get_buffer, cache, - partitionInfo->info.offset, 1024, &buffer); + status_t error = read_block(get_buffer, cache, 0, 1024, &buffer); if (!error && buffer) { superBlock = (disk_super_block*)(buffer+512); // dump_super_block(superBlock); diff --git a/src/add-ons/kernel/disk_scanner/fs/iso9660.c b/src/add-ons/kernel/disk_scanner/fs/iso9660.c index 7ee0b8bd76..a2b4e46788 100644 --- a/src/add-ons/kernel/disk_scanner/fs/iso9660.c +++ b/src/add-ons/kernel/disk_scanner/fs/iso9660.c @@ -162,7 +162,7 @@ iso9660_fs_identify(int deviceFD, struct extended_partition_info *partitionInfo, bool exit = false; // The first 16 blocks are for "system use" only, and thus are // irrelevant to us and generally just zeros - off_t offset = partitionInfo->info.offset + 16*blockSize; + off_t offset = 16 * blockSize; status_t error = B_OK; TRACE(("%s: identify(%d, %p)\n", kModuleDebugName, deviceFD,