Changeset 45f244b in mainline

Timestamp:

2008-04-15T03:15:43Z (17 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

9a5f0cb

Parents:

80e8482

Message:

libfs destroy operation should rather return an error code instead of a truth
value.

Location:

uspace

Files:

• lib/libfs/libfs.h (modified) (1 diff)
• srv/fs/fat/fat_ops.c (modified) (1 diff)
• srv/fs/tmpfs/tmpfs_ops.c (modified) (5 diffs)

uspace/lib/libfs/libfs.h ¶

@@ -47 +47 @@
         void (* node_put)(void *);
         void * (* create)(int);
-        bool (* destroy)(void *);
+        int (* destroy)(void *);
         bool (* link)(void *, void *, const char *);
         int (* unlink)(void *, void *);

uspace/srv/fs/fat/fat_ops.c ¶

@@ -312 +312 @@
 }
 
-static bool fat_destroy(void *node)
-{
-        return false;   /* not supported at the moment */
+static int fat_destroy(void *node)
+{
+        return ENOTSUP; /* not supported at the moment */
 }
 

uspace/srv/fs/tmpfs/tmpfs_ops.c ¶

@@ -76 +76 @@
 static bool tmpfs_link_node(void *, void *, const char *);
 static int tmpfs_unlink_node(void *, void *);
-static bool tmpfs_destroy_node(void *);
+static int tmpfs_destroy_node(void *);
 
 /* Implementation of helper functions. */
@@ -375 +375 @@
 }
 
-bool tmpfs_destroy_node(void *nodep)
+int tmpfs_destroy_node(void *nodep)
 {
         tmpfs_dentry_t *dentry = (tmpfs_dentry_t *) nodep;
@@ -391 +391 @@
                 free(dentry->data);
         free(dentry);
-        return true;
+        return EOK;
 }
 
@@ -580 +580 @@
         dev_handle_t dev_handle = (dev_handle_t)IPC_GET_ARG1(*request);
         fs_index_t index = (fs_index_t)IPC_GET_ARG2(*request);
+        int rc;
 
         link_t *hlp;
@@ -590 +591 @@
         tmpfs_dentry_t *dentry = hash_table_get_instance(hlp, tmpfs_dentry_t,
             dh_link);
-        tmpfs_destroy_node(dentry);
-        ipc_answer_0(rid, EOK);
+        rc = tmpfs_destroy_node(dentry);
+        ipc_answer_0(rid, rc);
 }