Commit 2f2e46c0 authored by Kirill Tkhai's avatar Kirill Tkhai Committed by Pavel Emelyanov

files: Kill file_desc_ops::want_transport()

Since transport fd is per-task, this method is not need anymore.
Kill it.

travis-ci: success for Rework file opening scheme to make it asynchronous (rev5)
Signed-off-by: 's avatarKirill Tkhai <ktkhai@virtuozzo.com>
Signed-off-by: 's avatarPavel Emelyanov <xemul@virtuozzo.com>
parent 9cb52aff
...@@ -102,11 +102,6 @@ struct file_desc_ops { ...@@ -102,11 +102,6 @@ struct file_desc_ops {
* and with the fd being the "restored" one. * and with the fd being the "restored" one.
*/ */
int (*post_open)(struct file_desc *d, int fd); int (*post_open)(struct file_desc *d, int fd);
/*
* Report whether the fd in question wants a transport socket
* in it instead of a real file. See file_master for details.
*/
int (*want_transport)(FdinfoEntry *fe, struct file_desc *d);
/* /*
* Called to collect a new fd before adding it on desc. Clients * Called to collect a new fd before adding it on desc. Clients
* may chose to collect it to some specific rst_info list. See * may chose to collect it to some specific rst_info list. See
......
...@@ -327,18 +327,9 @@ out: ...@@ -327,18 +327,9 @@ out:
return tmp; return tmp;
} }
static int want_transport(FdinfoEntry *fe, struct file_desc *d)
{
struct pipe_info *pi;
pi = container_of(d, struct pipe_info, d);
return !pi->create;
}
static struct file_desc_ops pipe_desc_ops = { static struct file_desc_ops pipe_desc_ops = {
.type = FD_TYPES__PIPE, .type = FD_TYPES__PIPE,
.open = open_pipe, .open = open_pipe,
.want_transport = want_transport,
.name = pipe_d_name, .name = pipe_d_name,
}; };
......
...@@ -1034,15 +1034,6 @@ done: ...@@ -1034,15 +1034,6 @@ done:
return ret; return ret;
} }
static int unixsk_should_open_transport(FdinfoEntry *fe,
struct file_desc *d)
{
struct unix_sk_info *ui;
ui = container_of(d, struct unix_sk_info, d);
return ui->flags & USK_PAIR_SLAVE;
}
static int open_unixsk_pair_master(struct unix_sk_info *ui) static int open_unixsk_pair_master(struct unix_sk_info *ui)
{ {
int sk[2]; int sk[2];
...@@ -1293,7 +1284,6 @@ static struct file_desc_ops unix_desc_ops = { ...@@ -1293,7 +1284,6 @@ static struct file_desc_ops unix_desc_ops = {
.type = FD_TYPES__UNIXSK, .type = FD_TYPES__UNIXSK,
.open = open_unix_sk, .open = open_unix_sk,
.post_open = post_open_unix_sk, .post_open = post_open_unix_sk,
.want_transport = unixsk_should_open_transport,
.name = socket_d_name, .name = socket_d_name,
}; };
......
...@@ -1108,12 +1108,6 @@ static int tty_open(struct file_desc *d) ...@@ -1108,12 +1108,6 @@ static int tty_open(struct file_desc *d)
return info->driver->open(info); return info->driver->open(info);
} }
static int tty_transport(FdinfoEntry *fe, struct file_desc *d)
{
struct tty_info *info = container_of(d, struct tty_info, d);
return !info->create;
}
static void tty_collect_fd(struct file_desc *d, struct fdinfo_list_entry *fle, static void tty_collect_fd(struct file_desc *d, struct fdinfo_list_entry *fle,
struct rst_info *ri) struct rst_info *ri)
{ {
...@@ -1150,7 +1144,6 @@ static struct file_desc_ops tty_desc_ops = { ...@@ -1150,7 +1144,6 @@ static struct file_desc_ops tty_desc_ops = {
.type = FD_TYPES__TTY, .type = FD_TYPES__TTY,
.open = tty_open, .open = tty_open,
.post_open = tty_restore_ctl_terminal, .post_open = tty_restore_ctl_terminal,
.want_transport = tty_transport,
.collect_fd = tty_collect_fd, .collect_fd = tty_collect_fd,
.name = tty_d_name, .name = tty_d_name,
}; };
......
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