Commit 19672e9c authored by Cyrill Gorcunov's avatar Cyrill Gorcunov Committed by Pavel Emelyanov

files: Rename argument to sock

It's unclear why we've had two different names
for same argument. Moreover, "tsk" is definitely
misnamed feature.
Signed-off-by: 's avatarCyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
parent 969ca6d9
......@@ -306,7 +306,7 @@ static int open_transport_fd(int pid, struct fdinfo_list_entry *fle)
return 0;
}
int send_fd_to_peer(int fd, struct fdinfo_list_entry *fle, int tsk)
int send_fd_to_peer(int fd, struct fdinfo_list_entry *fle, int sock)
{
struct sockaddr_un saddr;
int len;
......@@ -316,7 +316,7 @@ int send_fd_to_peer(int fd, struct fdinfo_list_entry *fle, int tsk)
transport_name_gen(&saddr, &len,
futex_get(&fle->real_pid), fle->fe->fd);
pr_info("\t\tSend fd %d to %s\n", fd, saddr.sun_path + 1);
return send_fd(tsk, &saddr, len, fd);
return send_fd(sock, &saddr, len, fd);
}
static int open_fd(int pid, FdinfoEntry *fe, struct file_desc *d)
......
......@@ -77,7 +77,7 @@ extern void file_desc_add(struct file_desc *d, u32 id, struct file_desc_ops *ops
extern struct fdinfo_list_entry *file_master(struct file_desc *d);
extern struct file_desc *find_file_desc_raw(int type, u32 id);
extern int send_fd_to_peer(int fd, struct fdinfo_list_entry *fle, int transport);
extern int send_fd_to_peer(int fd, struct fdinfo_list_entry *fle, int sock);
extern int restore_fown(int fd, FownEntry *fown);
extern int rst_file_params(int fd, FownEntry *fown, int flags);
......
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