i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Patch by Sean Bartell: Added support for old ReiserFS 3.5 super block location.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36102 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2010-04-10 12:02:02 +00:00
parent 6e83f0eda4
commit 37b79c0324
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/file_systems/reiserfs/SuperBlock.cpp
+11 -6
View File
@@ -32,9 +32,10 @@ using std::nothrow;
\class DirEntry \class DirEntry
\brief Represents the on-disk structure for super block of the FS. \brief Represents the on-disk structure for super block of the FS.
There exist two versions of the structure and this class can deal with There exist two versions of the structure and this class can deal with both
both of them. The Init() methods tries to find and read the super block of them. This class can also handle a very old layout that puts the super
from disk. block in a different location. The Init() methods tries to find and read
the super block from disk.
*/ */
// read_super_block // read_super_block
@@ -95,14 +96,18 @@ SuperBlock::~SuperBlock()
status_t status_t
SuperBlock::Init(int device, off_t offset) SuperBlock::Init(int device, off_t offset)
{ {
// Not sure, if I understand the weird versioning.
status_t error = B_OK; status_t error = B_OK;
// try old version // try old version and old layout
if (read_super_block(device, REISERFS_OLD_DISK_OFFSET_IN_BYTES + offset, if (read_super_block(device, REISERFS_OLD_DISK_OFFSET_IN_BYTES + offset,
REISERFS_SUPER_MAGIC_STRING, &fOldData) == B_OK) { REISERFS_SUPER_MAGIC_STRING, &fOldData) == B_OK) {
PRINT(("SuperBlock: ReiserFS 3.5 (old layout)\n"));
fFormatVersion = REISERFS_3_5;
// try old version and new layout
} else if (read_super_block(device, REISERFS_DISK_OFFSET_IN_BYTES + offset,
REISERFS_SUPER_MAGIC_STRING, &fOldData) == B_OK) {
PRINT(("SuperBlock: ReiserFS 3.5\n")); PRINT(("SuperBlock: ReiserFS 3.5\n"));
fFormatVersion = REISERFS_3_5; fFormatVersion = REISERFS_3_5;
// try new version // try new version and new layout
} else if (read_super_block(device, REISERFS_DISK_OFFSET_IN_BYTES + offset, } else if (read_super_block(device, REISERFS_DISK_OFFSET_IN_BYTES + offset,
REISER2FS_SUPER_MAGIC_STRING, &fOldData) == B_OK) { REISER2FS_SUPER_MAGIC_STRING, &fOldData) == B_OK) {
PRINT(("SuperBlock: ReiserFS 3.6\n")); PRINT(("SuperBlock: ReiserFS 3.6\n"));