[haiku-commits] r40182 - haiku/trunk/src/add-ons/kernel/file_systems/ext2
- From: korli@xxxxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sun, 9 Jan 2011 19:51:01 +0100 (CET)
Author: korli
Date: 2011-01-09 19:51:00 +0100 (Sun, 09 Jan 2011)
New Revision: 40182
Changeset: http://dev.haiku-os.org/changeset/40182
Ticket: http://dev.haiku-os.org/ticket/7079
Modified:
haiku/trunk/src/add-ons/kernel/file_systems/ext2/BitmapBlock.cpp
haiku/trunk/src/add-ons/kernel/file_systems/ext2/BitmapBlock.h
Log:
* finding marked or unmarked bit in the last double word didn't work, we need
to take start pos into account. Should fix #7079.
Modified: haiku/trunk/src/add-ons/kernel/file_systems/ext2/BitmapBlock.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/ext2/BitmapBlock.cpp
2011-01-09 17:49:05 UTC (rev 40181)
+++ haiku/trunk/src/add-ons/kernel/file_systems/ext2/BitmapBlock.cpp
2011-01-09 18:51:00 UTC (rev 40182)
@@ -25,7 +25,8 @@
CachedBlock(volume),
fData(NULL),
fReadOnlyData(NULL),
- fNumBits(numBits)
+ fNumBits(numBits),
+ fMaxIndex(fNumBits >> 5)
{
TRACE("BitmapBlock::BitmapBlock(): num bits: %lu\n", fNumBits);
}
@@ -403,47 +404,46 @@
uint32 index = pos >> 5;
uint32 bit = pos & 0x1F;
+ uint32 maxBit = 32;
- uint32 mask = (1 << bit) - 1;
+ uint32 mask = ~((1 << bit) - 1);
uint32 bits = B_LENDIAN_TO_HOST_INT32(data[index]);
TRACE("BitmapBlock::FindNextMarked(): index: %lu, bit: %lu, mask: %lX, "
"bits: %lX\n", index, bit, mask, bits);
- bits &= ~mask;
- uint32 maxBit = 32;
-
- if (bits == 0) {
- // Find a block of 32 bits that has a marked bit
- uint32 maxIndex = fNumBits >> 5;
- TRACE("BitmapBlock::FindNextMarked(): max index: %lu\n",
maxIndex);
-
+ bits &= mask;
+ if (bits == 0 && index < fMaxIndex) {
+ // Find a 32 bits block that has a marked bit
do {
index++;
- } while (index < maxIndex && data[index] == 0);
-
- if (index >= maxIndex) {
- maxBit = fNumBits & 0x1F;
-
- if (maxBit == 0) {
- // Not found
- TRACE("BitmapBlock::FindNextMarked(): reached
end of block, "
- "num bits: %lu\n", fNumBits);
- pos = fNumBits;
- return;
- }
- bits = B_LENDIAN_TO_HOST_INT32(data[maxIndex]);
- mask = (1 << maxBit) - 1;
- if ((bits & mask) == 0) {
- pos = fNumBits;
- return;
- }
- maxBit++;
- } else
- bits = B_LENDIAN_TO_HOST_INT32(data[index]);
+ } while (index < fMaxIndex && data[index] == 0);
bit = 0;
+ mask = 0xffffffff;
}
+ if (index >= fMaxIndex) {
+ maxBit = fNumBits & 0x1F;
+
+ if (maxBit == 0) {
+ // Not found
+ TRACE("BitmapBlock::FindNextMarked(): reached end of
block, "
+ "num bits: %lu\n", fNumBits);
+ pos = fNumBits;
+ return;
+ }
+ bits = B_LENDIAN_TO_HOST_INT32(data[fMaxIndex]);
+ mask &= (1 << maxBit) - 1;
+ if ((bits & mask) == 0) {
+ TRACE("BitmapBlock::FindNextMarked(): reached end of
block, "
+ "num bits: %lu\n", fNumBits);
+ pos = fNumBits;
+ return;
+ }
+ maxBit++;
+ } else
+ bits = B_LENDIAN_TO_HOST_INT32(data[index]);
+
for (; bit < maxBit; ++bit) {
// Find the marked bit
if ((bits >> bit & 1) != 0) {
@@ -474,47 +474,47 @@
uint32 index = pos >> 5;
uint32 bit = pos & 0x1F;
+ uint32 maxBit = 32;
- uint32 mask = (1 << bit) - 1;
+ uint32 mask = ~((1 << bit) - 1);
uint32 bits = B_LENDIAN_TO_HOST_INT32(data[index]);
TRACE("BitmapBlock::FindNextUnmarked(): index: %lu, bit: %lu, mask:
%lX, "
"bits: %lX\n", index, bit, mask, bits);
- bits &= ~mask;
- uint32 maxBit = 32;
+ bits &= mask;
- if (bits == ~mask) {
- // Find an block of 32 bits that has a unmarked bit
- uint32 maxIndex = fNumBits >> 5;
- TRACE("BitmapBlock::FindNextUnmarked(): max index: %lu\n",
maxIndex);
-
+ if (bits == mask && index < fMaxIndex) {
+ // Find a 32 bits block that has an unmarked bit
do {
index++;
- } while (index < maxIndex && data[index] == 0xFFFFFFFF);
-
- if (index >= maxIndex) {
- maxBit = fNumBits & 0x1F;
-
- if (maxBit == 0) {
- // Not found
- TRACE("BitmapBlock::FindNextUnmarked(): reached
end of block, "
- "num bits: %lu\n", fNumBits);
- pos = fNumBits;
- return;
- }
- bits = B_LENDIAN_TO_HOST_INT32(data[maxIndex]);
- mask = (1 << maxBit) - 1;
- if ((bits & mask) == mask) {
- pos = fNumBits;
- return;
- }
- maxBit++;
- } else
- bits = B_LENDIAN_TO_HOST_INT32(data[index]);
+ } while (index < fMaxIndex && data[index] == 0xFFFFFFFF);
bit = 0;
+ mask = 0xffffffff;
}
+ if (index >= fMaxIndex) {
+ maxBit = fNumBits & 0x1F;
+
+ if (maxBit == 0) {
+ // Not found
+ TRACE("BitmapBlock::FindNextUnmarked(): reached end of
block, "
+ "num bits: %lu\n", fNumBits);
+ pos = fNumBits;
+ return;
+ }
+ bits = B_LENDIAN_TO_HOST_INT32(data[fMaxIndex]);
+ mask &= (1 << maxBit) - 1;
+ if ((bits & mask) == mask) {
+ TRACE("BitmapBlock::FindNextUnmarked(): reached end of
block, "
+ "num bits: %lu\n", fNumBits);
+ pos = fNumBits;
+ return;
+ }
+ maxBit++;
+ } else
+ bits = B_LENDIAN_TO_HOST_INT32(data[index]);
+
TRACE("BitmapBlock::FindNextUnmarked(): searching bit at pos %lu\n",
bit);
for (; bit < maxBit; ++bit) {
// Find the unmarked bit
@@ -594,14 +594,13 @@
return;
uint32 wordSpan = length >> 5;
- uint32 lastIndex = fNumBits >> 5;
uint32 startIndex = 0;
uint32 index = 0;
uint32 bits = B_LENDIAN_TO_HOST_INT32(data[0]);
TRACE("BitmapBlock::FindLargestUnmarkedRange(): word span: %lu, last "
"index: %lu, start index: %lu, index: %lu, bits: %lX, start:
%lu, "
- "length: %lu\n", wordSpan, lastIndex, startIndex, index, bits,
start,
+ "length: %lu\n", wordSpan, fMaxIndex, startIndex, index, bits,
start,
length);
if (wordSpan == 0) {
@@ -640,7 +639,7 @@
bits = B_LENDIAN_TO_HOST_INT32(data[index]);
}
- for (; index < lastIndex; ++index) {
+ for (; index < fMaxIndex; ++index) {
bits = B_LENDIAN_TO_HOST_INT32(data[index]);
if (bits != 0) {
Modified: haiku/trunk/src/add-ons/kernel/file_systems/ext2/BitmapBlock.h
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/ext2/BitmapBlock.h
2011-01-09 17:49:05 UTC (rev 40181)
+++ haiku/trunk/src/add-ons/kernel/file_systems/ext2/BitmapBlock.h
2011-01-09 18:51:00 UTC (rev 40182)
@@ -43,6 +43,7 @@
const uint32* fReadOnlyData;
uint32 fNumBits;
+ uint32 fMaxIndex;
};
#endif // BITMAPBLOCK_H
Other related posts:
- » [haiku-commits] r40182 - haiku/trunk/src/add-ons/kernel/file_systems/ext2 - korli
