Changeset 0013b9ce in mainline

Timestamp:

2008-11-23T12:27:15Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7782030

Parents:

f714576

Message:

libfs operation link() should return standard error code instead of mere
true/false.

Location:

uspace

Files:

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

uspace/lib/libfs/libfs.c

@@ -197 +197 @@
                                             index);
                                 if (nodep) {
-                                        if (!ops->link(cur, nodep, component)) {
+                                        int rc;
+
+                                        rc = ops->link(cur, nodep, component);
+                                        if (rc != EOK) {
                                                 if (lflag & L_CREATE) {
                                                         (void)ops->destroy(
                                                             nodep);
                                                 }
-                                                ipc_answer_0(rid, ENOSPC);
+                                                ipc_answer_0(rid, rc);
                                         } else {
                                                 ipc_answer_5(rid, EOK,
@@ -267 +270 @@
                                 nodep = ops->node_get(dev_handle, index);
                         if (nodep) {
-                                if (!ops->link(cur, nodep, component)) {
+                                int rc;
+
+                                rc = ops->link(cur, nodep, component);
+                                if (rc != EOK) {
                                         if (lflag & L_CREATE)
                                                 (void)ops->destroy(nodep);
-                                        ipc_answer_0(rid, ENOSPC);
+                                        ipc_answer_0(rid, rc);
                                 } else {
                                         ipc_answer_5(rid, EOK,

uspace/lib/libfs/libfs.h

@@ -48 +48 @@
         void * (* create)(dev_handle_t, int);
         int (* destroy)(void *);
-        bool (* link)(void *, void *, const char *);
+        int (* link)(void *, void *, const char *);
         int (* unlink)(void *, void *);
         fs_index_t (* index_get)(void *);

uspace/srv/fs/fat/fat_ops.c

@@ -224 +224 @@
 static void *fat_create_node(dev_handle_t, int);
 static int fat_destroy_node(void *);
-static bool fat_link(void *, void *, const char *);
+static int fat_link(void *, void *, const char *);
 static int fat_unlink(void *, void *);
 static void *fat_match(void *, const char *);
@@ -342 +342 @@
 }
 
-bool fat_link(void *prnt, void *chld, const char *name)
-{
-        return false;   /* not supported at the moment */
+int fat_link(void *prnt, void *chld, const char *name)
+{
+        return ENOTSUP; /* not supported at the moment */
 }
 
@@ -526 +526 @@
 };
 
+/*
+ * VFS operations.
+ */
+
 void fat_mounted(ipc_callid_t rid, ipc_call_t *request)
 {

uspace/srv/fs/tmpfs/tmpfs_dump.c

@@ -60 +60 @@
         struct rdentry entry;
         libfs_ops_t *ops = &tmpfs_libfs_ops;
+        int rc;
         
         do {
@@ -94 +95 @@
                         fname[entry.len] = 0;
                         
-                        if (!ops->link((void *) parent, (void *) node, fname)) {
+                        rc = ops->link((void *) parent, (void *) node, fname);
+                        if (rc != EOK) {
                                 ops->destroy((void *) node);
                                 free(fname);
@@ -135 +137 @@
                         }
                         fname[entry.len] = 0;
-                        
-                        if (!ops->link((void *) parent, (void *) node, fname)) {
+
+                        rc = ops->link((void *) parent, (void *) node, fname);
+                        if (rc != EOK) {
                                 ops->destroy((void *) node);
                                 free(fname);

uspace/srv/fs/tmpfs/tmpfs_ops.c

@@ -76 +76 @@
 static void tmpfs_node_put(void *);
 static void *tmpfs_create_node(dev_handle_t, int);
-static bool tmpfs_link_node(void *, void *, const char *);
+static int tmpfs_link_node(void *, void *, const char *);
 static int tmpfs_unlink_node(void *, void *);
 static int tmpfs_destroy_node(void *);
@@ -309 +309 @@
 }
 
-bool tmpfs_link_node(void *prnt, void *chld, const char *nm)
+int tmpfs_link_node(void *prnt, void *chld, const char *nm)
 {
         tmpfs_dentry_t *parentp = (tmpfs_dentry_t *) prnt;
@@ -318 +318 @@
         tmpfs_name_t *namep = malloc(sizeof(tmpfs_name_t));
         if (!namep)
-                return false;
+                return ENOMEM;
         tmpfs_name_initialize(namep);
         size_t len = strlen(nm);
@@ -324 +324 @@
         if (!namep->name) {
                 free(namep);
-                return false;
+                return ENOMEM;
         }
         strcpy(namep->name, nm);
@@ -344 +344 @@
         }
 
-        return true;
+        return EOK;
 }