Commit 028d6355 authored by Pavel Emelyanov's avatar Pavel Emelyanov

mount: Rename paths' lengths to reflect whose lengths they are

Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
Acked-by: 's avatarAndrew Vagin <avagin@parallels.com>
parent 6b005904
...@@ -410,7 +410,7 @@ static inline int path_length(char *path) ...@@ -410,7 +410,7 @@ static inline int path_length(char *path)
static int validate_shared(struct mount_info *m) static int validate_shared(struct mount_info *m)
{ {
struct mount_info *t, *ct, *cm, *tmp; struct mount_info *t, *ct, *cm, *tmp;
int t_root_len, m_root_len, tpm, mpm; int t_root_l, m_root_l, t_mpnt_l, m_mpnt_l;
LIST_HEAD(children); LIST_HEAD(children);
/* /*
...@@ -436,16 +436,16 @@ static int validate_shared(struct mount_info *m) ...@@ -436,16 +436,16 @@ static int validate_shared(struct mount_info *m)
/* A set of childrent which ar visiable for both should be the same */ /* A set of childrent which ar visiable for both should be the same */
t_root_len = path_length(t->root); t_root_l = path_length(t->root);
m_root_len = path_length(m->root); m_root_l = path_length(m->root);
tpm = path_length(t->mountpoint); t_mpnt_l = path_length(t->mountpoint);
mpm = path_length(m->mountpoint); m_mpnt_l = path_length(m->mountpoint);
/* For example: /* For example:
* t->root = / t->mp = ./zdtm/live/static/mntns_root_bind.test * t->root = / t->mp = ./zdtm/live/static/mntns_root_bind.test
* m->root = /test m->mp = ./zdtm/live/static/mntns_root_bind.test/test.bind * m->root = /test m->mp = ./zdtm/live/static/mntns_root_bind.test/test.bind
* t_root_len = 0 tpm = 39 * t_root_l = 0 t_mpnt_l = 39
* m_root_len = 5 mpm = 49 * m_root_l = 5 m_mpnt_l = 49
* ct->root = / ct->mp = ./zdtm/live/static/mntns_root_bind.test/test/sub * ct->root = / ct->mp = ./zdtm/live/static/mntns_root_bind.test/test/sub
* tp = /test/sub mp = /test len=5 * tp = /test/sub mp = /test len=5
*/ */
...@@ -456,7 +456,7 @@ static int validate_shared(struct mount_info *m) ...@@ -456,7 +456,7 @@ static int validate_shared(struct mount_info *m)
* ct: | | /test/sub | * ct: | | /test/sub |
* cm: | /test | /sub | * cm: | /test | /sub |
* | A | B | * | A | B |
* | ct->mountpoint + tpm * | ct->mountpoint + t_mpnt_l
* | m->root + strlen(t->root) * | m->root + strlen(t->root)
*/ */
...@@ -468,9 +468,9 @@ static int validate_shared(struct mount_info *m) ...@@ -468,9 +468,9 @@ static int validate_shared(struct mount_info *m)
if (ct->is_ns_root) if (ct->is_ns_root)
continue; continue;
tp = ct->mountpoint + tpm; tp = ct->mountpoint + t_mpnt_l;
mp = m->root + t_root_len; mp = m->root + t_root_l;
len = m_root_len - t_root_len; len = m_root_l - t_root_l;
/* A */ /* A */
...@@ -485,7 +485,7 @@ static int validate_shared(struct mount_info *m) ...@@ -485,7 +485,7 @@ static int validate_shared(struct mount_info *m)
list_for_each_entry_safe(cm, tmp, &m->children, siblings) { list_for_each_entry_safe(cm, tmp, &m->children, siblings) {
/* B */ /* B */
if (strcmp(ct->mountpoint + tpm + len, cm->mountpoint + mpm)) if (strcmp(ct->mountpoint + t_mpnt_l + len, cm->mountpoint + m_mpnt_l))
continue; continue;
if (!mounts_equal(cm, ct, false)) { if (!mounts_equal(cm, ct, false)) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment