Use request_spfs_mngr_sock() for both start and socket request. Signed-off-by: Stanislav Kinsburskiy <skinsbur...@virtuozzo.com> --- criu/spfs.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/criu/spfs.c b/criu/spfs.c index 0d44b72..1ead01b 100644 --- a/criu/spfs.c +++ b/criu/spfs.c @@ -292,18 +292,23 @@ int spfs_mount(struct mount_info *mi, const char *source, sock = start_spfs_mngr(); if (sock < 0) { - pr_err("failed to mount NFS to path %s\n", mi->mountpoint); - return sock; + pr_err("failed to connect to SPFS manager: %d\n", sock); + ret = sock; + goto err; } - ret = spfs_request_mount(sock, mi, source, filesystemtype, mountflags); close(sock); if (ret) { - pr_err("mount of %s (%s) failed: %d\n", source, filesystemtype, ret); - return ret; + pr_err("mount request for %s (%s) failed: %d\n", + source, filesystemtype, ret); + goto err; } return 0; + +err: + pr_err("failed to mount NFS to path %s\n", mi->mountpoint); + return ret; } int spfs_set_env(void) _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel