github: Update for main branch

[mirror_lxc.git] / CODING_STYLE.md

diff --git a/CODING_STYLE.md b/CODING_STYLE.md
index 6e2ad8562a93e690455e4dcfe2fedfc7e1fdac06..e4949b622232db551a058a60821916fe4718376f 100644 (file)
--- a/CODING_STYLE.md
+++ b/CODING_STYLE.md
@@ -689,6 +689,8 @@ int lxc_attach_run_command(void *payload)
                case ENOEXEC:
                        ret = 126;
                        break;
+               case ENOTDIR:
+                       __fallthrough;
                case ENOENT:
                        ret = 127;
                        break;
@@ -733,11 +735,11 @@ __do_closedir __attribute__((__cleanup__(__auto_closedir__)))
 ```
 For example:
 ```c
-void remount_all_slave(void)
+void turn_into_dependent_mounts(void)
 {
        __do_free char *line = NULL;
        __do_fclose FILE *f = NULL;
-       __do_close_prot_errno int memfd = -EBADF, mntinfo_fd = -EBADF;
+       __do_close int memfd = -EBADF, mntinfo_fd = -EBADF;
        int ret;
        ssize_t copied;
        size_t len = 0;
@@ -780,7 +782,7 @@ again:
                return;
        }
 
-       f = fdopen(memfd, "r");
+       f = fdopen(memfd, "re");
        if (!f) {
                SYSERROR("Failed to open copy of \"/proc/self/mountinfo\" to mark all shared. Continuing");
                return;
@@ -810,12 +812,11 @@ again:
                null_endofword(target);
                ret = mount(NULL, target, NULL, MS_SLAVE, NULL);
                if (ret < 0) {
-                       SYSERROR("Failed to make \"%s\" MS_SLAVE", target);
-                       ERROR("Continuing...");
+                       SYSERROR("Failed to recursively turn old root mount tree into dependent mount. Continuing...");
                        continue;
                }
-               TRACE("Remounted \"%s\" as MS_SLAVE", target);
+               TRACE("Recursively turned old root mount tree into dependent mount");
        }
-       TRACE("Remounted all mount table entries as MS_SLAVE");
+       TRACE("Turned all mount table entries into dependent mount");
 }
 ```