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

Timestamp:

2014-04-16T17:14:06Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

f857e8b

Parents:

dba3e2c (diff), 70b570c (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) (3 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
 };