From 3178ceb8c7e0a94ed29bbd1e277f03bb0d5a3d44 Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Wed, 19 Aug 2020 12:58:51 +0200 Subject: mausezahn: move variable definitions from mops.h to mops.c Move variable definitions to avoid "multiple definition of symbol" linker errors with gcc-10. Updates #216 Signed-off-by: Tobias Klauser --- staging/mops.c | 5 ++++- staging/mops.h | 8 ++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/staging/mops.c b/staging/mops.c index 599d317..fc00e29 100644 --- a/staging/mops.c +++ b/staging/mops.c @@ -46,8 +46,11 @@ #include "mz.h" #include "mops.h" +unsigned int min_frame_s; +unsigned int max_frame_s; - +struct automops * amp_head; +struct mops *mp_head; // This global will point to the head of the mops list // Creates first element, aka "head" element // This element can also be used! See mops_alloc_packet! diff --git a/staging/mops.h b/staging/mops.h index 96953e6..cf19f09 100644 --- a/staging/mops.h +++ b/staging/mops.h @@ -114,8 +114,8 @@ // These are initialized with the definitions MIN_MOPS_FRAME_SIZE and // MAX_MOPS_FRAME_SIZE above but can be overridden by the user (without // extending these limits) -unsigned int min_frame_s; -unsigned int max_frame_s; +extern unsigned int min_frame_s; +extern unsigned int max_frame_s; struct mops_counter { @@ -246,7 +246,7 @@ struct automops { }; -struct automops * amp_head; +extern struct automops * amp_head; struct mops @@ -688,7 +688,7 @@ struct mops_ext_syslog //TODO ///////////////////////////////////////////////////////////////// -struct mops *mp_head; // This global will point to the head of the mops list +extern struct mops *mp_head; // This global will point to the head of the mops list ///////////////////////////////////////////////////////////////// // MOPS Prototypes: -- cgit v1.2.3-54-g00ecf mentation/kobject.txt?h=nds-private-remove'>logtreecommitdiff
path: root/Documentation/kobject.txt
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2016-06-02 10:29:47 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2016-06-05 10:36:01 -0700
commiteedf265aa003b4781de24cfed40a655a664457e6 (patch)
tree0e37f0a0c6fd15f7528aa3d3bfaec5685f083282 /Documentation/kobject.txt
parent049ec1b5a76d34a6980cccdb7c0baeb4eed7a993 (diff)
devpts: Make each mount of devpts an independent filesystem.
The /dev/ptmx device node is changed to lookup the directory entry "pts" in the same directory as the /dev/ptmx device node was opened in. If there is a "pts" entry and that entry is a devpts filesystem /dev/ptmx uses that filesystem. Otherwise the open of /dev/ptmx fails. The DEVPTS_MULTIPLE_INSTANCES configuration option is removed, so that userspace can now safely depend on each mount of devpts creating a new instance of the filesystem. Each mount of devpts is now a separate and equal filesystem. Reserved ttys are now available to all instances of devpts where the mounter is in the initial mount namespace. A new vfs helper path_pts is introduced that finds a directory entry named "pts" in the directory of the passed in path, and changes the passed in path to point to it. The helper path_pts uses a function path_parent_directory that was factored out of follow_dotdot. In the implementation of devpts: - devpts_mnt is killed as it is no longer meaningful if all mounts of devpts are equal. - pts_sb_from_inode is replaced by just inode->i_sb as all cached inodes in the tty layer are now from the devpts filesystem. - devpts_add_ref is rolled into the new function devpts_ptmx. And the unnecessary inode hold is removed. - devpts_del_ref is renamed devpts_release and reduced to just a deacrivate_super. - The newinstance mount option continues to be accepted but is now ignored. In devpts_fs.h definitions for when !CONFIG_UNIX98_PTYS are removed as they are never used. Documentation/filesystems/devices.txt is updated to describe the current situation. This has been verified to work properly on openwrt-15.05, centos5, centos6, centos7, debian-6.0.2, debian-7.9, debian-8.2, ubuntu-14.04.3, ubuntu-15.10, fedora23, magia-5, mint-17.3, opensuse-42.1, slackware-14.1, gentoo-20151225 (13.0?), archlinux-2015-12-01. With the caveat that on centos6 and on slackware-14.1 that there wind up being two instances of the devpts filesystem mounted on /dev/pts, the lower copy does not end up getting used. Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com> Cc: Greg KH <greg@kroah.com> Cc: Peter Hurley <peter@hurleysoftware.com> Cc: Peter Anvin <hpa@zytor.com> Cc: Andy Lutomirski <luto@amacapital.net> Cc: Al Viro <viro@zeniv.linux.org.uk> Cc: Serge Hallyn <serge.hallyn@ubuntu.com> Cc: Willy Tarreau <w@1wt.eu> Cc: Aurelien Jarno <aurelien@aurel32.net> Cc: One Thousand Gnomes <gnomes@lxorguk.ukuu.org.uk> Cc: Jann Horn <jann@thejh.net> Cc: Jiri Slaby <jslaby@suse.com> Cc: Florian Weimer <fw@deneb.enyo.de> Cc: Konstantin Khlebnikov <koct9i@gmail.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'Documentation/kobject.txt')