2020-03-02 10:55:40

by Tobias Klauser

Subject: [PATCH 1/2] pty: define and set show_fdinfo only if procfs is enabled

Follow the pattern used with other *_show_fdinfo functions and only
define and use pty_show_fdinfo if CONFIG_PROC_FS is set.

Signed-off-by: Tobias Klauser <[email protected]>
---
drivers/tty/pty.c | 4 ++++
1 file changed, 4 insertions(+)

diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c
index 00099a8439d2..dceaff332ca5 100644
--- a/drivers/tty/pty.c
+++ b/drivers/tty/pty.c
@@ -756,10 +756,12 @@ static void pty_unix98_remove(struct tty_driver *driver, struct tty_struct *tty)
}
}

+#ifdef CONFIG_PROC_FS
static void pty_show_fdinfo(struct tty_struct *tty, struct seq_file *m)
{
seq_printf(m, "tty-index:\t%d\n", tty->index);
}
+#endif

static const struct tty_operations ptm_unix98_ops = {
.lookup = ptm_unix98_lookup,
@@ -776,7 +778,9 @@ static const struct tty_operations ptm_unix98_ops = {
.compat_ioctl = pty_unix98_compat_ioctl,
.resize = pty_resize,
.cleanup = pty_cleanup,
+#ifdef CONFIG_PROC_FS
.show_fdinfo = pty_show_fdinfo,
+#endif
};

static const struct tty_operations pty_unix98_ops = {
--
2.25.0

2020-03-02 10:56:08

by Tobias Klauser

Subject: [PATCH 2/2] tty: define and set show_fdinfo only if procfs is enabled

Follow the pattern used with other *_show_fdinfo functions and only
define and use tty_show_fdinfo if CONFIG_PROC_FS is set.

Signed-off-by: Tobias Klauser <[email protected]>
---
drivers/tty/tty_io.c | 4 ++++
1 file changed, 4 insertions(+)

diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
index a1453fe10862..4a6b6116aa72 100644
--- a/drivers/tty/tty_io.c
+++ b/drivers/tty/tty_io.c
@@ -467,6 +467,7 @@ static int hung_up_tty_fasync(int fd, struct file *file, int on)
return -ENOTTY;
}

+#ifdef CONFIG_PROC_FS
static void tty_show_fdinfo(struct seq_file *m, struct file *file)
{
struct tty_struct *tty = file_tty(file);
@@ -474,6 +475,7 @@ static void tty_show_fdinfo(struct seq_file *m, struct file *file)
if (tty && tty->ops && tty->ops->show_fdinfo)
tty->ops->show_fdinfo(tty, m);
}
+#endif

static const struct file_operations tty_fops = {
.llseek = no_llseek,
@@ -485,7 +487,9 @@ static const struct file_operations tty_fops = {
.open = tty_open,
.release = tty_release,
.fasync = tty_fasync,
+#ifdef CONFIG_PROC_FS
.show_fdinfo = tty_show_fdinfo,
+#endif
};

static const struct file_operations console_fops = {
--
2.25.0