Changeset 79b77ce in mainline

Timestamp:

2025-12-17T00:00:01Z (3 weeks ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

81805e0

Parents:

2309891

Message:

Allow retrying failed file/dir creation and file open.

Location:

uspace

Files:

• app/copy/copy.c (modified) (2 diffs)
• lib/fmgt/include/types/fmgt.h (modified) (1 diff)
• lib/fmgt/src/copy.c (modified) (2 diffs)

uspace/app/copy/copy.c

@@ -133 +133 @@
         cons_event_t event;
         kbd_event_t *ev;
+        const char *opstr = NULL;
         errno_t rc;
 
@@ -143 +144 @@
                 putchar('\n');
 
-        fprintf(stderr, "I/O error %s file '%s' (%s).\n",
-            err->optype == fmgt_io_write ? "writing" : "reading",
-            err->fname, str_error(err->rc));
+        switch (err->optype) {
+        case fmgt_io_read:
+                opstr = "reading";
+                break;
+        case fmgt_io_write:
+                opstr = "writing";
+                break;
+        case fmgt_io_create:
+                opstr = "creating";
+                break;
+        case fmgt_io_open:
+                opstr = "opening";
+                break;
+        }
+
+        fprintf(stderr, "I/O error %s file '%s' (%s).\n", opstr, err->fname,
+            str_error(err->rc));
         fprintf(stderr, "[A]bort or [R]etry?\n");
 

uspace/lib/fmgt/include/types/fmgt.h

@@ -65 +65 @@
         fmgt_io_read,
         /** Write */
-        fmgt_io_write
+        fmgt_io_write,
+        /** Open */
+        fmgt_io_open,
+        /** Create */
+        fmgt_io_create
 } fmgt_io_op_type_t;
 

uspace/lib/fmgt/src/copy.c

@@ -97 +97 @@
 {
         fmgt_t *fmgt = (fmgt_t *)arg;
-        errno_t rc;
-
-        rc = vfs_link_path(dest, KIND_DIRECTORY, NULL);
-
-        /* It is okay if the directory exists. */
-        if (rc != EOK && rc != EEXIST)
-                return rc; // XXX error recovery?
-
-        (void)fmgt;
-        return EOK;
+        fmgt_io_error_t err;
+        fmgt_error_action_t action;
+        errno_t rc;
+
+        do {
+                rc = vfs_link_path(dest, KIND_DIRECTORY, NULL);
+
+                /* It is okay if the directory exists. */
+                if (rc == EOK || rc == EEXIST)
+                        break;
+
+                /* I/O error */
+                err.fname = dest;
+                err.optype = fmgt_io_create;
+                err.rc = rc;
+
+                fmgt_timer_stop(fmgt);
+                action = fmgt_io_error_query(fmgt, &err);
+                fmgt_timer_start(fmgt);
+        } while (action == fmgt_er_retry);
+
+        return rc;
 }
 
@@ -133 +145 @@
                 return ENOMEM;
 
-        rc = vfs_lookup_open(src, WALK_REGULAR, MODE_READ, &rfd);
+        do {
+                rc = vfs_lookup_open(src, WALK_REGULAR, MODE_READ, &rfd);
+                if (rc == EOK)
+                        break;
+
+                /* I/O error */
+                err.fname = src;
+                err.optype = fmgt_io_open;
+                err.rc = rc;
+                fmgt_timer_stop(fmgt);
+                action = fmgt_io_error_query(fmgt, &err);
+                fmgt_timer_start(fmgt);
+        } while (action == fmgt_er_retry);
+
+        /* Not recovered? */
         if (rc != EOK) {
                 free(buffer);
-                return rc; // XXX error recovery?
+                return rc;
         }
 
-        rc = vfs_lookup_open(dest, WALK_REGULAR | WALK_MAY_CREATE, MODE_WRITE,
-            &wfd);
+        do {
+                rc = vfs_lookup_open(dest, WALK_REGULAR | WALK_MAY_CREATE,
+                    MODE_WRITE, &wfd);
+                if (rc == EOK)
+                        break;
+
+                /* I/O error */
+                err.fname = dest;
+                err.optype = fmgt_io_create;
+                err.rc = rc;
+                fmgt_timer_stop(fmgt);
+                action = fmgt_io_error_query(fmgt, &err);
+                fmgt_timer_start(fmgt);
+        } while (action == fmgt_er_retry);
+
         if (rc != EOK) {
                 free(buffer);