In commit 7eeb5b4afa8db5a2f2e1e47ab6b84e55fc8c5661 I addressed first half of a problem, but I happen to work with dirty copy of libvzctl where mount_opts cgroup has been c/r'ed manually, so I missed the case where @devmnt_list is empty on restore (just like it is in vanilla libvzctl). So fix the second half.
https://jira.sw.ru/browse/PSBM-48188 Reported-by: Igor Sukhih <[email protected]> Signed-off-by: Cyrill Gorcunov <[email protected]> CC: Vladimir Davydov <[email protected]> CC: Konstantin Khorenko <[email protected]> --- fs/namespace.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) Index: linux-pcs7.git/fs/namespace.c =================================================================== --- linux-pcs7.git.orig/fs/namespace.c +++ linux-pcs7.git/fs/namespace.c @@ -1954,10 +1954,20 @@ again: goto again; case 1: if (*data_pp) { - ve_printk(VE_LOG_BOTH, KERN_WARNING "VE%s: no allowed " - "mount options found for device %u:%u\n", - ve->ve_name, MAJOR(dev), MINOR(dev)); - err = -EPERM; + /* + * Same as in chunk above but for case where + * ve->devmnt_list is empty. Depending on + * the way userspace tool restore container + * it might be nonempty as well. + */ + if (ve->is_pseudosuper) { + err = 0; + } else { + ve_printk(VE_LOG_BOTH, KERN_WARNING "VE%s: no allowed " + "mount options found for device %u:%u\n", + ve->ve_name, MAJOR(dev), MINOR(dev)); + err = -EPERM; + } } else err = 0; break; _______________________________________________ Devel mailing list [email protected] https://lists.openvz.org/mailman/listinfo/devel
