Changeset b800b0e in mainline for uspace/srv/fs/udf/udf_ops.c

Timestamp:

2012-10-23T13:16:49Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

6ecf5b8

Parents:

32b3a12 (diff), b2ac3998 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

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

uspace/srv/fs/udf/udf_ops.c

@@ -311 +311 @@
         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 +322 @@
         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 +329 @@
         }
         
-        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 +353 @@
         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 +364 @@
         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);