Date: Sat, 25 May 2019 18:36:39 +0000 (UTC) From: Johannes Lundberg <johalun@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r348277 - in stable/12/sys: compat/linuxkpi/common/include/linux modules/linuxkpi Message-ID: <201905251836.x4PIadKg013256@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: johalun Date: Sat May 25 18:36:38 2019 New Revision: 348277 URL: https://svnweb.freebsd.org/changeset/base/348277 Log: MFC r347892: LinuxKPI: Finalize import of seq_file. seq_file.h and linux_seq_file.c was imported form ports earlier but linux_seq_file.c was never compiled in with the module. With this commit base seq_file will replace ports seq_file and it required a few modifications to not break functionality and build. Reviewed by: hps Approved by: imp (mentor), hps Modified: stable/12/sys/compat/linuxkpi/common/include/linux/seq_file.h stable/12/sys/modules/linuxkpi/Makefile Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/compat/linuxkpi/common/include/linux/seq_file.h ============================================================================== --- stable/12/sys/compat/linuxkpi/common/include/linux/seq_file.h Sat May 25 18:23:32 2019 (r348276) +++ stable/12/sys/compat/linuxkpi/common/include/linux/seq_file.h Sat May 25 18:36:38 2019 (r348277) @@ -30,13 +30,29 @@ #ifndef _LINUX_SEQ_FILE_H_ #define _LINUX_SEQ_FILE_H_ +#include <linux/types.h> +#include <linux/fs.h> #include <sys/sbuf.h> -struct seq_operations; -struct linux_file; - +#undef file #define inode vnode +#define DEFINE_SHOW_ATTRIBUTE(__name) \ +static int __name ## _open(struct inode *inode, struct linux_file *file) \ +{ \ + return single_open(file, __name ## _show, inode->i_private); \ +} \ + \ +static const struct file_operations __name ## _fops = { \ + .owner = THIS_MODULE, \ + .open = __name ## _open, \ + .read = seq_read, \ + .llseek = seq_lseek, \ + .release = single_release, \ +} + +struct seq_operations; + struct seq_file { struct sbuf *buf; @@ -67,5 +83,6 @@ int single_release(struct inode *, struct linux_file * #define seq_puts(m, str) sbuf_printf((m)->buf, str) #define seq_putc(m, str) sbuf_putc((m)->buf, str) +#define file linux_file #endif /* _LINUX_SEQ_FILE_H_ */ Modified: stable/12/sys/modules/linuxkpi/Makefile ============================================================================== --- stable/12/sys/modules/linuxkpi/Makefile Sat May 25 18:23:32 2019 (r348276) +++ stable/12/sys/modules/linuxkpi/Makefile Sat May 25 18:36:38 2019 (r348277) @@ -13,6 +13,7 @@ SRCS= linux_compat.c \ linux_pci.c \ linux_radix.c \ linux_rcu.c \ + linux_seq_file.c \ linux_schedule.c \ linux_slab.c \ linux_tasklet.c \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201905251836.x4PIadKg013256>