Some changes to/fixes of the KDiskSystem interface and the disk system module interface.

git-svn-id: file:///srv/svn/repos/haiku/trunk/current@3987 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2003-07-15 21:41:32 +00:00
parent a97769a5d3
commit 0fbb290f51
9 changed files with 388 additions and 35 deletions
@@ -55,14 +55,23 @@ public:
virtual bool SupportsResizingChild(KPartition *child);
virtual bool SupportsMoving(KPartition *partition, bool *whileMounted);
virtual bool SupportsMovingChild(KPartition *child);
virtual bool SupportsSettingName(KPartition *partition);
virtual bool SupportsSettingContentName(KPartition *partition,
bool *whileMounted);
virtual bool SupportsSettingType(KPartition *partition);
virtual bool SupportsCreatingChild(KPartition *partition);
virtual bool SupportsParentSystem(KDiskSystem *system);
virtual bool SupportsChildSystem(KDiskSystem *system);
virtual bool SupportsDeletingChild(KPartition *child);
virtual bool SupportsInitializing(KPartition *partition);
virtual bool SupportsInitializingChild(KPartition *child,
const char *diskSystem);
virtual bool ValidateResize(KPartition *partition, off_t *size);
virtual bool ValidateResizeChild(KPartition *partition, off_t *size);
virtual bool ValidateMove(KPartition *partition, off_t *start);
virtual bool ValidateMoveChild(KPartition *partition, off_t *start);
virtual bool ValidateSetName(KPartition *partition, char *name);
virtual bool ValidateSetContentName(KPartition *partition, char *name);
virtual bool ValidateSetType(KPartition *partition, const char *type);
virtual bool ValidateCreateChild(KPartition *partition, off_t *start,
off_t *size, const char *type,
const char *parameters);
@@ -78,6 +87,11 @@ public:
int32 count,
int32 *actualCount = NULL);
virtual status_t GetNextSupportedType(KPartition *partition, int32 *cookie,
char *type);
virtual status_t GetTypeForContentType(const char *contentType,
char *type);
// Writing
// Device should not be locked.
@@ -92,6 +106,12 @@ public:
KDiskDeviceJob *job);
virtual status_t MoveChild(KPartition *child, off_t offset,
KDiskDeviceJob *job);
virtual status_t SetName(KPartition *partition, char *name,
KDiskDeviceJob *job);
virtual status_t SetContentName(KPartition *partition, char *name,
KDiskDeviceJob *job);
virtual status_t SetType(KPartition *partition, char *type,
KDiskDeviceJob *job);
virtual status_t CreateChild(KPartition *partition, off_t offset,
off_t size, const char *type,
const char *parameters, KDiskDeviceJob *job,
@@ -37,10 +37,13 @@ public:
bool *whileMounted);
virtual bool SupportsResizing(KPartition *partition, bool *whileMounted);
virtual bool SupportsMoving(KPartition *partition, bool *whileMounted);
virtual bool SupportsParentSystem(KDiskSystem *system);
virtual bool SupportsSettingContentName(KPartition *partition,
bool *whileMounted);
virtual bool SupportsInitializing(KPartition *partition);
virtual bool ValidateResize(KPartition *partition, off_t *size);
virtual bool ValidateMove(KPartition *partition, off_t *start);
virtual bool ValidateSetContentName(KPartition *partition, char *name);
virtual bool ValidateInitialize(KPartition *partition,
const char *parameters);
virtual bool ValidateSetContentParameters(KPartition *child,
@@ -55,6 +58,8 @@ public:
KDiskDeviceJob *job);
virtual status_t Move(KPartition *partition, off_t offset,
KDiskDeviceJob *job);
virtual status_t SetContentName(KPartition *partition, char *name,
KDiskDeviceJob *job);
virtual status_t Initialize(KPartition *partition, const char *parameters,
KDiskDeviceJob *job);
virtual status_t SetContentParameters(KPartition *partition,
@@ -35,14 +35,23 @@ public:
virtual bool SupportsResizingChild(KPartition *child);
virtual bool SupportsMoving(KPartition *partition, bool *whileMounted);
virtual bool SupportsMovingChild(KPartition *child);
virtual bool SupportsCreatingChild(KPartition *child);
virtual bool SupportsParentSystem(KDiskSystem *system);
virtual bool SupportsChildSystem(KDiskSystem *system);
virtual bool SupportsSettingName(KPartition *partition);
virtual bool SupportsSettingContentName(KPartition *partition,
bool *whileMounted);
virtual bool SupportsSettingType(KPartition *partition);
virtual bool SupportsCreatingChild(KPartition *partition);
virtual bool SupportsDeletingChild(KPartition *child);
virtual bool SupportsInitializing(KPartition *partition);
virtual bool SupportsInitializingChild(KPartition *child,
const char *diskSystem);
virtual bool ValidateResize(KPartition *partition, off_t *size);
virtual bool ValidateResizeChild(KPartition *partition, off_t *size);
virtual bool ValidateMove(KPartition *partition, off_t *start);
virtual bool ValidateMoveChild(KPartition *partition, off_t *start);
virtual bool ValidateSetName(KPartition *partition, char *name);
virtual bool ValidateSetContentName(KPartition *partition, char *name);
virtual bool ValidateSetType(KPartition *partition, const char *type);
virtual bool ValidateCreateChild(KPartition *partition, off_t *start,
off_t *size, const char *type,
const char *parameters);
@@ -58,6 +67,11 @@ public:
int32 count,
int32 *actualCount = NULL);
virtual status_t GetNextSupportedType(KPartition *partition, int32 *cookie,
char *type);
virtual status_t GetTypeForContentType(const char *contentType,
char *type);
// Writing
virtual status_t Repair(KPartition *partition, bool checkOnly,
@@ -70,6 +84,12 @@ public:
KDiskDeviceJob *job);
virtual status_t MoveChild(KPartition *child, off_t offset,
KDiskDeviceJob *job);
virtual status_t SetName(KPartition *partition, char *name,
KDiskDeviceJob *job);
virtual status_t SetContentName(KPartition *partition, char *name,
KDiskDeviceJob *job);
virtual status_t SetType(KPartition *partition, char *type,
KDiskDeviceJob *job);
virtual status_t CreateChild(KPartition *partition, off_t offset,
off_t size, const char *type,
const char *parameters, KDiskDeviceJob *job,
@@ -35,10 +35,18 @@ typedef bool (*partition_supports_moving_partition)(partition_data *partition,
bool *whileMounted);
typedef bool (*partition_supports_moving_child_partition)(
partition_data *partition, partition_data *child);
typedef bool (*partition_supports_setting_name)(partition_data *partition);
typedef bool (*partition_supports_setting_content_name)(
partition_data *partition);
typedef bool (*partition_supports_setting_type)(partition_data *partition);
typedef bool (*partition_supports_creating_child_partition)(
partition_data *partition);
typedef bool (*partition_supports_parent_system)(const char *system);
typedef bool (*partition_supports_child_system)(const char *system);
typedef bool (*partition_supports_deleting_child_partition)(
partition_data *partition, partition_data *child);
typedef bool (*partition_supports_initializing_partition)(
partition_data *partition);
typedef bool (*partition_supports_initializing_child_partition)(
partition_data *partition, const char *system);
typedef bool (*partition_validate_resize_partition)(partition_data *partition,
off_t *size);
@@ -48,6 +56,12 @@ typedef bool (*partition_validate_resize_child_partition)(
partition_data *partition, partition_data *child, off_t *size);
typedef bool (*partition_validate_move_child_partition)(
partition_data *partition, partition_data *child, off_t *start);
typedef bool (*partition_validate_set_name)(partition_data *partition,
char *name);
typedef bool (*partition_validate_set_content_name)(partition_data *partition,
char *name);
typedef bool (*partition_validate_set_type)(partition_data *partition,
const char *type);
typedef bool (*partition_validate_create_child_partition)(
partition_data *partition, partition_data *child, off_t *start,
off_t *size, const char *type, const char *parameters);
@@ -61,6 +75,11 @@ typedef bool (*partition_get_partitionable_spaces)(partition_data *partition,
partitionable_space_data *spaces, int32 count, int32 *actualCount);
// When not implemented, a standard algorithm is used.
typedef bool (*partition_get_next_supported_type)(partition_data *partition,
int32 *cookie, char *type);
typedef bool (*partition_get_type_for_content_type)(partition_data *partition,
const char *contentType, char *type);
// writing
// (device is NOT locked)
typedef status_t (*partition_repair_partition)(int fd,
@@ -73,6 +92,12 @@ typedef status_t (*partition_move_partition)(int fd,
partition_id partition, off_t offset, disk_job_id job);
typedef status_t (*partition_move_child_partition)(int fd,
partition_id partition, partition_id child, off_t offset, disk_job_id job);
typedef status_t (*partition_set_name)(int fd, partition_id partition,
const char *name, disk_job_id job);
typedef status_t (*partition_set_content_name)(int fd, partition_id partition,
const char *name, disk_job_id job);
typedef status_t (*partition_set_type)(int fd, partition_id partition,
const char *type, disk_job_id job);
typedef status_t (*partition_create_child_partition)(int fd,
partition_id partition, off_t offset, off_t size, const char *type,
const char *parameters, disk_job_id job, partition_id *childID);
@@ -106,15 +131,26 @@ typedef struct partition_module_info {
partition_supports_moving_partition supports_moving_partition;
partition_supports_moving_child_partition
supports_moving_child_partition;
partition_supports_setting_name supports_setting_name;
partition_supports_setting_content_name supports_setting_content_name;
partition_supports_setting_type supports_setting_type;
partition_supports_creating_child_partition
supports_creating_child_partition;
partition_supports_parent_system supports_parent_system;
partition_supports_child_system supports_child_system;
partition_supports_deleting_child_partition
supports_deleting_child_partition;
partition_supports_initializing_partition
supports_initializing_partition;
partition_supports_initializing_child_partition
supports_initializing_child_partition;
partition_validate_resize_partition validate_resize_partition;
partition_validate_resize_child_partition
validate_resize_child_partition;
partition_validate_move_partition validate_move_partition;
partition_validate_move_child_partition validate_move_child_partition;
partition_validate_set_name validate_set_name;
partition_validate_set_content_name validate_set_content_name;
partition_validate_set_type validate_set_type;
partition_validate_create_child_partition
validate_create_child_partition;
partition_validate_initialize_partition validate_initialize_partition;
@@ -123,6 +159,8 @@ typedef struct partition_module_info {
partition_validate_set_partition_content_parameters
validate_set_partition_content_parameters;
partition_get_partitionable_spaces get_partitionable_spaces;
partition_get_next_supported_type get_next_supported_type;
partition_get_type_for_content_type get_type_for_content_type;
// writing
partition_repair_partition repair_partition;
@@ -130,6 +168,9 @@ typedef struct partition_module_info {
partition_resize_child_partition resize_child_partition;
partition_move_partition move_partition;
partition_move_child_partition move_child_partition;
partition_set_name set_name;
partition_set_content_name set_content_name;
partition_set_type set_type;
partition_create_child_partition create_child_partition;
partition_delete_child_partition delete_child_partition;
partition_initialize_partition initialize_partition;
@@ -161,12 +202,16 @@ typedef bool (*fs_supports_resizing_partition)(partition_data *partition,
bool *whileMounted);
typedef bool (*fs_supports_moving_partition)(partition_data *partition,
bool *whileMounted);
typedef bool (*fs_supports_parent_system)(const char *system);
typedef bool (*fs_supports_setting_content_name)(partition_data *partition,
bool *whileMounted);
typedef bool (*fs_supports_initializing_partition)(partition_data *partition);
typedef bool (*fs_validate_resize_partition)(partition_data *partition,
off_t *size);
typedef bool (*fs_validate_move_partition)(partition_data *partition,
off_t *start);
typedef bool (*fs_validate_set_content_name)(partition_data *partition,
char *name);
typedef bool (*fs_validate_initialize_partition)(partition_data *partition,
const char *parameters);
typedef bool (*fs_validate_set_partition_content_parameters)(
@@ -182,6 +227,8 @@ typedef status_t (*fs_resize_partition)(int fd, partition_id partition,
off_t size, disk_job_id job);
typedef status_t (*fs_move_partition)(int fd, partition_id partition,
off_t offset, disk_job_id job);
typedef status_t (*fs_set_content_name)(int fd, partition_id partition,
const char *name, disk_job_id job);
typedef status_t (*fs_initialize_partition)(const char *partition,
const char *parameters, disk_job_id job);
// This is pretty close to how the hook in R5 looked. Save the job ID, of
@@ -205,9 +252,13 @@ typedef struct fs_module_info {
fs_supports_reparing_partition supports_reparing_partition;
fs_supports_resizing_partition supports_resizing_partition;
fs_supports_moving_partition supports_moving_partition;
fs_supports_parent_system supports_parent_system;
fs_supports_setting_content_name supports_setting_content_name;
fs_supports_initializing_partition
supports_initializing_partition;
fs_validate_resize_partition validate_resize_partition;
fs_validate_move_partition validate_move_partition;
fs_validate_set_content_name validate_set_content_name;
fs_validate_initialize_partition validate_initialize_partition;
fs_validate_set_partition_content_parameters
validate_set_partition_content_parameters;
@@ -217,6 +268,7 @@ typedef struct fs_module_info {
fs_repair_partition repair_partition;
fs_resize_partition resize_partition;
fs_move_partition move_partition;
fs_set_content_name set_content_name;
fs_initialize_partition initialize_partition;
fs_set_partition_content_parameters
set_partition_content_parameters;