remove MS_* which can not be combined with current kernel code

MS_BIND|MS_MOVE can not be combined:
  do_mount()
    else if (flags & MS_BIND)
      do_loopback(&path, dev_name, flags & MS_REC);
    [...]
    else if (flags & MS_MOVE)
      do_move_mount(&path, dev_name);

MS_REMOUNT|MS_UNBINDABLE can not be combined:
  do_mount()
    if (flags & MS_REMOUNT)
      do_remount(&path, flags & ~MS_REMOUNT, mnt_flags, data_page);
    [...]
    else if (flags & (MS_SHARED | MS_PRIVATE | MS_SLAVE | MS_UNBINDABLE))
      do_change_type(&path, flags);

diff --git a/src/core/namespace.c b/src/core/namespace.c
index da555cd23ce21c8802052eeaa6234419282cca33..7ac6b381abb772870457a1fe7e3e628f009622d1 100644 (file)
--- a/src/core/namespace.c
+++ b/src/core/namespace.c
@@ -167,7 +167,7 @@ static int apply_mount(Path *p, const char *root_dir, const char *inaccessible_d
 
                 /* Avoid exponential growth of trees */
                 if (r >= 0 && path_equal(p->path, "/"))
 
                 /* Avoid exponential growth of trees */
                 if (r >= 0 && path_equal(p->path, "/"))

-                        r = mount(NULL, where, NULL, MS_REMOUNT|MS_BIND|MS_UNBINDABLE|flags, NULL);
+                        r = mount(NULL, where, NULL, MS_REMOUNT|MS_BIND|flags, NULL);

 
                 if (r < 0) {
                         r = -errno;
 
                 if (r < 0) {
                         r = -errno;

diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index ce727b6e1d8b3d663855a19a69fac4e52c8e2d2b..90c8b94248b406c3baefca74fd272e2a6c609462 100644 (file)
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -928,7 +928,7 @@ int main(int argc, char *argv[]) {
                     dup2(STDIN_FILENO, STDERR_FILENO) != STDERR_FILENO)
                         goto child_fail;
 
                     dup2(STDIN_FILENO, STDERR_FILENO) != STDERR_FILENO)
                         goto child_fail;
 

-                if (mount(arg_directory, "/", "bind", MS_BIND|MS_MOVE, NULL) < 0) {
+                if (mount(arg_directory, "/", "bind", MS_BIND, NULL) < 0) {

                         log_error("mount(MS_MOVE) failed: %m");
                         goto child_fail;
                 }
                         log_error("mount(MS_MOVE) failed: %m");
                         goto child_fail;
                 }