Changes in uspace/srv/fs/udf/udf_ops.c [48e3190:fc22069] in mainline

File:

• uspace/srv/fs/udf/udf_ops.c (modified) (9 diffs)

uspace/srv/fs/udf/udf_ops.c

@@ -50 +50 @@
 #include <assert.h>
 #include <fibril_synch.h>
-#include <sys/mman.h>
 #include <align.h>
 #include <malloc.h>
@@ -247 +246 @@
         
         return false;
+}
+
+static int udf_size_block(service_id_t service_id, uint32_t *size)
+{
+        udf_instance_t *instance;
+        int rc = fs_instance_get(service_id, (void **) &instance);
+        if (rc != EOK)
+                return rc;
+
+        if (NULL == instance)
+                return ENOENT;
+        
+        *size = instance->volumes[DEFAULT_VOL].logical_block_size;
+        
+        return EOK;
+}
+
+static int udf_total_block_count(service_id_t service_id, uint64_t *count)
+{
+        *count = 0;
+        
+        return EOK;
+}
+
+static int udf_free_block_count(service_id_t service_id, uint64_t *count)
+{
+        *count = 0;
+        
+        return EOK;
 }
 
@@ -265 +293 @@
         .is_directory = udf_is_directory,
         .is_file = udf_is_file,
-        .service_get = udf_service_get
+        .service_get = udf_service_get,
+        .size_block = udf_size_block,
+        .total_block_count = udf_total_block_count,
+        .free_block_count = udf_free_block_count
 };
 
@@ -294 +325 @@
         
         /* initialize block cache */
-        int rc = block_init(EXCHANGE_SERIALIZE, service_id, MAX_SIZE);
+        int rc = block_init(service_id, MAX_SIZE);
         if (rc != EOK)
                 return rc;
@@ -311 +342 @@
         rc = udf_volume_recongnition(service_id);
         if (rc != EOK) {
-                log_msg(LVL_NOTE, "VRS failed");
+                log_msg(LOG_DEFAULT, LVL_NOTE, "VRS failed");
                 fs_instance_destroy(service_id);
                 free(instance);
@@ -322 +353 @@
         rc = udf_get_anchor_volume_descriptor(service_id, &avd);
         if (rc != EOK) {
-                log_msg(LVL_NOTE, "Anchor read failed");
+                log_msg(LOG_DEFAULT, LVL_NOTE, "Anchor read failed");
                 fs_instance_destroy(service_id);
                 free(instance);
@@ -329 +360 @@
         }
         
-        log_msg(LVL_DEBUG,
+        log_msg(LOG_DEFAULT, LVL_DEBUG,
             "Volume: Anchor volume descriptor found. Sector size=%" PRIu32,
             instance->sector_size);
-        log_msg(LVL_DEBUG,
+        log_msg(LOG_DEFAULT, LVL_DEBUG,
             "Anchor: main sequence [length=%" PRIu32 " (bytes), start=%"
             PRIu32 " (sector)]", avd.main_extent.length,
             avd.main_extent.location);
-        log_msg(LVL_DEBUG,
+        log_msg(LOG_DEFAULT, LVL_DEBUG,
             "Anchor: reserve sequence [length=%" PRIu32 " (bytes), start=%"
             PRIu32 " (sector)]", avd.reserve_extent.length,
@@ -353 +384 @@
         rc = udf_read_volume_descriptor_sequence(service_id, avd.main_extent);
         if (rc != EOK) {
-                log_msg(LVL_NOTE, "Volume Descriptor Sequence read failed");
+                log_msg(LOG_DEFAULT, LVL_NOTE, "Volume Descriptor Sequence read failed");
                 fs_instance_destroy(service_id);
                 free(instance);
@@ -364 +395 @@
         rc = udf_node_get(&rfn, service_id, instance->volumes[DEFAULT_VOL].root_dir);
         if (rc != EOK) {
-                log_msg(LVL_NOTE, "Can't create root node");
+                log_msg(LOG_DEFAULT, LVL_NOTE, "Can't create root node");
                 fs_instance_destroy(service_id);
                 free(instance);