Ticket #5707: bfs_DeviceBlockSize.patch

src/add-ons/kernel/file_systems/bfs/kernel_interface.cpp

@@ -87 +87 @@
     size_t size, struct file_io_vec* vecs, size_t* _count)
 {
     Inode* inode = (Inode*)cookie;
-    return file_map_translate(inode->Map(), offset, size, vecs, _count, 512);
-        // TODO: Use the actual block size of the underlying device for the
-        // alignment!
+    uint32 deviceBlockSize = inode->GetVolume()->BlockSize();
+
+    return file_map_translate(inode->Map(), offset, size, vecs, _count, 
+        deviceBlockSize);
 }
 
 

src/add-ons/kernel/file_systems/bfs/Volume.cpp

@@ -344 +344 @@
 
     // check if the device size is large enough to hold the file system
     off_t diskSize;
-    if (opener.GetSize(&diskSize) != B_OK)
+    if (opener.GetSize(&diskSize, &fDeviceBlockSize) != B_OK)
         RETURN_ERROR(B_ERROR);
     if (diskSize < (NumBlocks() << BlockShift()))
         RETURN_ERROR(B_BAD_VALUE);

src/add-ons/kernel/file_systems/bfs/Volume.h

@@ -65 +65 @@
             off_t           FreeBlocks() const
                                 { return NumBlocks() - UsedBlocks(); }
 
+            uint32          DeviceBlockSize() const { return fDeviceBlockSize; }
             uint32          BlockSize() const { return fBlockSize; }
             uint32          BlockShift() const { return fBlockShift; }
             uint32          InodeSize() const
@@ -141 +142 @@
             fs_volume*      fVolume;
             int             fDevice;
             disk_super_block fSuperBlock;
-
+            
+            uint32          fDeviceBlockSize;
             uint32          fBlockSize;
             uint32          fBlockShift;
             uint32          fAllocationGroupShift;