Commit 1c799333 authored by Tycho Andersen's avatar Tycho Andersen Committed by Pavel Emelyanov

remove some double ;;s

Signed-off-by: 's avatarTycho Andersen <tycho.andersen@canonical.com>
Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
parent 39e3859d
...@@ -398,7 +398,7 @@ static int restore_priv_vma_content(pid_t pid) ...@@ -398,7 +398,7 @@ static int restore_priv_vma_content(pid_t pid)
* Read page contents. * Read page contents.
*/ */
while (1) { while (1) {
unsigned long off, i, nr_pages;; unsigned long off, i, nr_pages;
struct iovec iov; struct iovec iov;
ret = pr.get_pagemap(&pr, &iov); ret = pr.get_pagemap(&pr, &iov);
......
...@@ -211,7 +211,7 @@ struct watch_list { ...@@ -211,7 +211,7 @@ struct watch_list {
static int dump_inotify_entry(union fdinfo_entries *e, void *arg) static int dump_inotify_entry(union fdinfo_entries *e, void *arg)
{ {
struct watch_list *wd_list = (struct watch_list *) arg; struct watch_list *wd_list = (struct watch_list *) arg;
struct inotify_wd_entry *wd_entry = (struct inotify_wd_entry *) e;; struct inotify_wd_entry *wd_entry = (struct inotify_wd_entry *) e;
InotifyWdEntry *we = &wd_entry->e; InotifyWdEntry *we = &wd_entry->e;
pr_info("wd: wd 0x%08x s_dev 0x%08x i_ino 0x%16"PRIx64" mask 0x%08x\n", pr_info("wd: wd 0x%08x s_dev 0x%08x i_ino 0x%16"PRIx64" mask 0x%08x\n",
......
...@@ -817,7 +817,7 @@ static int open_mountpoint(struct mount_info *pm) ...@@ -817,7 +817,7 @@ static int open_mountpoint(struct mount_info *pm)
goto out; goto out;
} }
return __open_mountpoint(pm, fd);; return __open_mountpoint(pm, fd);
out: out:
if (ns_old >= 0) if (ns_old >= 0)
restore_ns(ns_old, &mnt_ns_desc); restore_ns(ns_old, &mnt_ns_desc);
......
...@@ -781,7 +781,7 @@ int check_parent_local_xfer(int fd_type, int id) ...@@ -781,7 +781,7 @@ int check_parent_local_xfer(int fd_type, int id)
pfd = openat(get_service_fd(IMG_FD_OFF), CR_PARENT_LINK, O_RDONLY); pfd = openat(get_service_fd(IMG_FD_OFF), CR_PARENT_LINK, O_RDONLY);
if (pfd < 0 && errno == ENOENT) if (pfd < 0 && errno == ENOENT)
return 0;; return 0;
snprintf(path, sizeof(path), imgset_template[fd_type].fmt, id); snprintf(path, sizeof(path), imgset_template[fd_type].fmt, id);
ret = fstatat(pfd, path, &st, 0); ret = fstatat(pfd, path, &st, 0);
......
...@@ -501,7 +501,7 @@ static int parasite_init_daemon(struct parasite_ctl *ctl, struct ns_id *net) ...@@ -501,7 +501,7 @@ static int parasite_init_daemon(struct parasite_ctl *ctl, struct ns_id *net)
args->log_level = log_get_loglevel(); args->log_level = log_get_loglevel();
if (prepare_tsock(ctl, pid, args, net)) if (prepare_tsock(ctl, pid, args, net))
goto err;; goto err;
/* after this we can catch parasite errors in chld handler */ /* after this we can catch parasite errors in chld handler */
if (setup_child_handler()) if (setup_child_handler())
...@@ -1175,7 +1175,7 @@ static int parasite_start_daemon(struct parasite_ctl *ctl, struct pstree_item *i ...@@ -1175,7 +1175,7 @@ static int parasite_start_daemon(struct parasite_ctl *ctl, struct pstree_item *i
return -1; return -1;
if (parasite_init_daemon(ctl, dmpi(item)->netns)) if (parasite_init_daemon(ctl, dmpi(item)->netns))
return -1;; return -1;
return 0; return 0;
} }
......
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