Changeset 6f5995f in mainline

Timestamp:

2026-07-09T10:19:11Z (6 days ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

48cc66f

Parents:

08499f0

git-author:

Jiri Svoboda <jiri@…> (2026-07-08 18:11:14)

git-committer:

Jiri Svoboda <jiri@…> (2026-07-09 10:19:11)

Message:

Return valid node or error code from fs node_get operation.

Location:

uspace/srv/fs

Files:

• cdfs/cdfs_ops.c (modified) (3 diffs)
• exfat/exfat_ops.c (modified) (2 diffs)
• fat/fat_ops.c (modified) (2 diffs)
• tmpfs/tmpfs_ops.c (modified) (3 diffs)

uspace/srv/fs/cdfs/cdfs_ops.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2024 Jiri Svoboda
+ * Copyright (c) 2026 Jiri Svoboda
  * Copyright (c) 2011 Martin Decky
  * All rights reserved.
@@ -341 +341 @@
 
         ht_link_t *link = hash_table_find(&nodes, &key);
-        if (link) {
-                cdfs_node_t *node =
-                    hash_table_get_inst(link, cdfs_node_t, nh_link);
-
-                *rfn = FS_NODE(node);
-        } else
+        if (!link) {
                 *rfn = NULL;
-
+                return EBADF;
+        }
+
+        cdfs_node_t *node = hash_table_get_inst(link, cdfs_node_t, nh_link);
+        *rfn = FS_NODE(node);
         return EOK;
 }
@@ -395 +394 @@
         errno_t rc = cdfs_root_get(&rootfn, fs->service_id);
 
-        assert(rc == EOK);
+        assert(rc == EOK || rc == EBADF);
 
         if (!rootfn)

uspace/srv/fs/exfat/exfat_ops.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2024 Jiri Svoboda
+ * Copyright (c) 2026 Jiri Svoboda
  * Copyright (c) 2008 Jakub Jermar
  * Copyright (c) 2011 Oleg Romanenko
@@ -573 +573 @@
         if (!idxp) {
                 *rfn = NULL;
-                return EOK;
+                return EBADF;
         }
         /* idxp->lock held */

uspace/srv/fs/fat/fat_ops.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2024 Jiri Svoboda
+ * Copyright (c) 2026 Jiri Svoboda
  * Copyright (c) 2008 Jakub Jermar
  * Copyright (c) 2011 Oleg Romanenko
@@ -436 +436 @@
         if (!idxp) {
                 *rfn = NULL;
-                return EOK;
+                return EBADF;
         }
         /* idxp->lock held */

uspace/srv/fs/tmpfs/tmpfs_ops.c

@@ -1 +1 @@
 /*
+ * Copyright (c) 2026 Jiri Svoboda
  * Copyright (c) 2008 Jakub Jermar
  * All rights reserved.
@@ -276 +277 @@
         ht_link_t *lnk = hash_table_find(&nodes, &key);
 
-        if (lnk) {
-                tmpfs_node_t *nodep;
-                nodep = hash_table_get_inst(lnk, tmpfs_node_t, nh_link);
-                *rfn = FS_NODE(nodep);
-        } else {
+        if (lnk == NULL) {
                 *rfn = NULL;
-        }
+                return EBADF;
+        }
+
+        tmpfs_node_t *nodep;
+        nodep = hash_table_get_inst(lnk, tmpfs_node_t, nh_link);
+        *rfn = FS_NODE(nodep);
         return EOK;
 }
@@ -320 +322 @@
 
         rc = tmpfs_root_get(&rootfn, service_id);
-        assert(rc == EOK);
-        if (!rootfn)
+        assert(rc == EOK || rc == EBADF);
+        if (rootfn == NULL)
                 nodep->index = TMPFS_SOME_ROOT;
         else