Changeset f783081 in mainline

Timestamp:

2021-10-25T00:32:45Z (3 years ago)

Author:

jxsvoboda <5887334+jxsvoboda@…>

Branches:

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

Children:

7aeb52cb

Parents:

4fcc2de

git-author:

Jiri Svoboda <jiri@…> (2021-10-16 21:48:59)

git-committer:

jxsvoboda <5887334+jxsvoboda@…> (2021-10-25 00:32:45)

Message:

libfs's service_get() returns service ID for service-special files

Not the service ID of the owning file system. Any file-system except
locfs should return zero.

Location:

uspace

Files:

• lib/ext4/src/ops.c (modified) (1 diff)
• srv/fs/fat/fat_ops.c (modified) (1 diff)
• srv/fs/mfs/mfs_ops.c (modified) (1 diff)
• srv/fs/udf/udf_ops.c (modified) (1 diff)

uspace/lib/ext4/src/ops.c

@@ -810 +810 @@
 }
 
-/** Extract device identifier from node.
+/** Get service ID for a service-special file.
  *
  * @param node Node to extract id from
  *
- * @return id of device, where is the filesystem
+ * @return Service ID for a service-special file, zero for a regular file.
  *
  */
 service_id_t ext4_service_get(fs_node_t *fn)
 {
-        ext4_node_t *enode = EXT4_NODE(fn);
-        return enode->instance->service_id;
+        return 0;
 }
 

uspace/srv/fs/fat/fat_ops.c

@@ -839 +839 @@
 service_id_t fat_service_get(fs_node_t *fn)
 {
-        return FAT_NODE(fn)->idx->service_id;
+        return 0;
 }
 

uspace/srv/fs/mfs/mfs_ops.c

@@ -392 +392 @@
 mfs_service_get(fs_node_t *fsnode)
 {
-        struct mfs_node *node = fsnode->data;
-        return node->instance->service_id;
+        return 0;
 }
 

uspace/srv/fs/udf/udf_ops.c

@@ -104 +104 @@
 static service_id_t udf_service_get(fs_node_t *node)
 {
-        udf_node_t *udfn = UDF_NODE(node);
-        if (udfn)
-                return udfn->instance->service_id;
-
         return 0;
 }