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

File:

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

uspace/srv/fs/udf/udf_ops.c

@@ -249 +249 @@
 }
 
-static uint32_t udf_size_block(service_id_t service_id)
-{
-        udf_instance_t *instance;
-        int rc = fs_instance_get(service_id, (void **) &instance);
-        if (rc != EOK)
-                return rc;
-
-        if (NULL == instance)
-                return ENOENT;
-        
-        return instance->volumes[DEFAULT_VOL].logical_block_size;
-}
-
 libfs_ops_t udf_libfs_ops = {
         .root_get = udf_root_get,
@@ -278 +265 @@
         .is_directory = udf_is_directory,
         .is_file = udf_is_file,
-        .service_get = udf_service_get,
-        .size_block = udf_size_block
+        .service_get = udf_service_get
 };
 
@@ -325 +311 @@
         rc = udf_volume_recongnition(service_id);
         if (rc != EOK) {
-                log_msg(LOG_DEFAULT, LVL_NOTE, "VRS failed");
+                log_msg(LVL_NOTE, "VRS failed");
                 fs_instance_destroy(service_id);
                 free(instance);
@@ -336 +322 @@
         rc = udf_get_anchor_volume_descriptor(service_id, &avd);
         if (rc != EOK) {
-                log_msg(LOG_DEFAULT, LVL_NOTE, "Anchor read failed");
+                log_msg(LVL_NOTE, "Anchor read failed");
                 fs_instance_destroy(service_id);
                 free(instance);
@@ -343 +329 @@
         }
         
-        log_msg(LOG_DEFAULT, LVL_DEBUG,
+        log_msg(LVL_DEBUG,
             "Volume: Anchor volume descriptor found. Sector size=%" PRIu32,
             instance->sector_size);
-        log_msg(LOG_DEFAULT, LVL_DEBUG,
+        log_msg(LVL_DEBUG,
             "Anchor: main sequence [length=%" PRIu32 " (bytes), start=%"
             PRIu32 " (sector)]", avd.main_extent.length,
             avd.main_extent.location);
-        log_msg(LOG_DEFAULT, LVL_DEBUG,
+        log_msg(LVL_DEBUG,
             "Anchor: reserve sequence [length=%" PRIu32 " (bytes), start=%"
             PRIu32 " (sector)]", avd.reserve_extent.length,
@@ -367 +353 @@
         rc = udf_read_volume_descriptor_sequence(service_id, avd.main_extent);
         if (rc != EOK) {
-                log_msg(LOG_DEFAULT, LVL_NOTE, "Volume Descriptor Sequence read failed");
+                log_msg(LVL_NOTE, "Volume Descriptor Sequence read failed");
                 fs_instance_destroy(service_id);
                 free(instance);
@@ -378 +364 @@
         rc = udf_node_get(&rfn, service_id, instance->volumes[DEFAULT_VOL].root_dir);
         if (rc != EOK) {
-                log_msg(LOG_DEFAULT, LVL_NOTE, "Can't create root node");
+                log_msg(LVL_NOTE, "Can't create root node");
                 fs_instance_destroy(service_id);
                 free(instance);