Commit 8cd64c5a authored by Pavel Emelyanov's avatar Pavel Emelyanov

unix: Cleanup ext socket check

Rename the fn and fix indentation.
Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
parent fbcb43bd
...@@ -1908,7 +1908,7 @@ int cr_dump_tasks(pid_t pid, const struct cr_options *opts) ...@@ -1908,7 +1908,7 @@ int cr_dump_tasks(pid_t pid, const struct cr_options *opts)
if (ret) if (ret)
goto err; goto err;
ret = dump_external_sockets(); ret = fix_external_unix_sockets();
if (ret) if (ret)
goto err; goto err;
......
...@@ -14,7 +14,7 @@ struct fdinfo_list_entry; ...@@ -14,7 +14,7 @@ struct fdinfo_list_entry;
struct file_desc; struct file_desc;
struct fdinfo_entry; struct fdinfo_entry;
extern int collect_sockets(void); extern int collect_sockets(void);
extern int dump_external_sockets(void); extern int fix_external_unix_sockets(void);
extern int collect_inet_sockets(void); extern int collect_inet_sockets(void);
extern int collect_unix_sockets(void); extern int collect_unix_sockets(void);
extern int resolve_unix_peers(void); extern int resolve_unix_peers(void);
......
...@@ -676,7 +676,7 @@ err: ...@@ -676,7 +676,7 @@ err:
return -1; return -1;
} }
int dump_external_sockets(void) int fix_external_unix_sockets(void)
{ {
struct unix_sk_desc *sk; struct unix_sk_desc *sk;
int i, ret = -1; int i, ret = -1;
...@@ -684,36 +684,36 @@ int dump_external_sockets(void) ...@@ -684,36 +684,36 @@ int dump_external_sockets(void)
pr_debug("Dumping external sockets\n"); pr_debug("Dumping external sockets\n");
list_for_each_entry(sk, &unix_sockets, list) { list_for_each_entry(sk, &unix_sockets, list) {
struct unix_sk_entry e = { }; struct unix_sk_entry e = { };
BUG_ON(sk->sd.already_dumped); BUG_ON(sk->sd.already_dumped);
if (!opts.ext_unix_sk) { if (!opts.ext_unix_sk) {
show_one_unix("Runaway socket", sk); show_one_unix("Runaway socket", sk);
goto err; goto err;
} }
if (sk->type != SOCK_DGRAM) { if (sk->type != SOCK_DGRAM) {
show_one_unix("Ext stream not supported", sk); show_one_unix("Ext stream not supported", sk);
goto err; goto err;
} }
e.id = sk->sd.ino; e.id = sk->sd.ino;
e.type = SOCK_DGRAM; e.type = SOCK_DGRAM;
e.state = TCP_LISTEN; e.state = TCP_LISTEN;
e.namelen = sk->namelen; e.namelen = sk->namelen;
e.uflags = USK_EXTERN; e.uflags = USK_EXTERN;
e.peer = 0; e.peer = 0;
show_one_unix("Dumping extern", sk); show_one_unix("Dumping extern", sk);
if (write_img(fdset_fd(glob_fdset, CR_FD_UNIXSK), &e)) if (write_img(fdset_fd(glob_fdset, CR_FD_UNIXSK), &e))
goto err; goto err;
if (write_img_buf(fdset_fd(glob_fdset, CR_FD_UNIXSK), if (write_img_buf(fdset_fd(glob_fdset, CR_FD_UNIXSK),
sk->name, e.namelen)) sk->name, e.namelen))
goto err; goto err;
show_one_unix_img("Dumped extern", &e); show_one_unix_img("Dumped extern", &e);
} }
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