Ticket #5698: reiserfs-label.patch

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

@@ -262 +262 @@
 void
 Volume::UpdateName(partition_id partitionID)
 {
+    if (fSuperBlock->GetLabel(fVolumeName, sizeof(fVolumeName)) == B_OK)
+        return;
     if (get_default_partition_content_name(partitionID, "ReiserFS",
-            fVolumeName, sizeof(fVolumeName)) != B_OK) {
-        strlcpy(fVolumeName, "ReiserFS Volume", sizeof(fVolumeName));
-    }
+            fVolumeName, sizeof(fVolumeName)) == B_OK)
+        return;
+    strlcpy(fVolumeName, "ReiserFS Volume", sizeof(fVolumeName));
 }
 
 

src/add-ons/kernel/file_systems/reiserfs/SuperBlock.h

@@ -85 +85 @@
             : le2h(fOldData->s_tree_height));
     }
 
+    status_t GetLabel(char* buffer, size_t bufferSize) const;
+
 private:
     uint32  fFormatVersion;
     union {

src/add-ons/kernel/file_systems/reiserfs/SuperBlock.cpp

@@ -109 +109 @@
         fFormatVersion = REISERFS_3_5;
     // try new version and new layout
     } else if (read_super_block(device, REISERFS_DISK_OFFSET_IN_BYTES + offset,
-            REISER2FS_SUPER_MAGIC_STRING, &fOldData) == B_OK) {
+            REISER2FS_SUPER_MAGIC_STRING, &fCurrentData) == B_OK) {
 PRINT(("SuperBlock: ReiserFS 3.6\n"));
         fFormatVersion = REISERFS_3_6;
     // failure
@@ -119 +119 @@
     return error;
 }
 
+
+// GetLabel
+status_t
+SuperBlock::GetLabel(char* buffer, size_t bufferSize) const
+{
+    if (GetFormatVersion() == REISERFS_3_6 && fCurrentData->s_label[0]) {
+        size_t len = MIN(sizeof(fCurrentData->s_label), bufferSize - 1);
+        memcpy(buffer, fCurrentData->s_label, len);
+        buffer[len] = '\0';
+        return B_OK;
+    }
+    return B_ENTRY_NOT_FOUND;
+}

src/add-ons/kernel/file_systems/reiserfs/reiserfs.h

@@ -272 +272 @@
                                    superblock. -Hans */
   uint16 s_reserved;
   uint32 s_inode_generation;
-  char s_unused[124] ;          /* zero filled by mkreiserfs */
+  uint32 s_flags;
+  char s_uuid[16];
+  char s_label[16];
+  uint16 s_mnt_count;
+  uint16 s_max_mnt_count;
+  uint32 s_lastcheck;
+  uint32 s_check_interval;
+  char s_unused[76] ;           /* zero filled by mkreiserfs */
 } _PACKED;
 
 #define SB_SIZE (sizeof(struct reiserfs_super_block))