mirrors/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-24 10:22:41 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Unify umount function implementations (bug 16552).

Browse Source 
Linux kernel architectures have various arrangements for umount
syscalls.  There is a syscall that takes flags, and an older one that
does not.  Newer architectures have only the one taking flags, under
the name umount2 (or under the name umount, in the ia64 case).  Older
architectures may have both, under the names umount2 and umount (or
under the names umount and oldumount, in the alpha case).  glibc then
has several similar implementations of the umount function (no flags)
in terms of either the __umount2 function, or the corresponding
syscall, or in terms of the old syscall under either of its names.

This patch simplifies the implementations in glibc by always using the
__umount2 function to implement the umount function on all systems
using the Linux kernel.  The linux/generic implementation is moved to
sysdeps/unix/sysv/linux (without any changes to code or comments) and
all the other variants are removed.  (This will have the effect of
causing the new syscall to be used in some cases that previously used
the old one, but as discussed for previous changes, such a change to
the underlying syscalls used is OK.)

There remain two variants of how the __umount2 function is
implemented, either in umount2.S, or, for ia64, in syscalls.list.

Tested with build-many-glibcs.py.

	[BZ #16552]
	* sysdeps/unix/sysv/linux/generic/umount.c: Move to ....
	* sysdeps/unix/sysv/linux/umount.c: ... here.
	* sysdeps/unix/sysv/linux/arm/umount.c: Remove file.
	* sysdeps/unix/sysv/linux/hppa/umount.c: Likewise.
	* sysdeps/unix/sysv/linux/ia64/umount.c: Likewise.
	* sysdeps/unix/sysv/linux/mips/mips64/umount.c: Likewise.
	* sysdeps/unix/sysv/linux/powerpc/powerpc64/umount.c: Likewise.
	* sysdeps/unix/sysv/linux/umount.S: Likewise.
	* sysdeps/unix/sysv/linux/x86_64/umount.c: Likewise.
This commit is contained in:
Joseph Myers 2018-03-26 21:18:28 +00:00
parent 3dfd23eb4b
commit 5f45f96ad0
9 changed files with 13 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ChangeLog
View File

@ -1,3 +1,16 @@
2018-03-26 Joseph Myers <joseph@codesourcery.com>
[BZ #16552]
* sysdeps/unix/sysv/linux/generic/umount.c: Move to ....
* sysdeps/unix/sysv/linux/umount.c: ... here.
* sysdeps/unix/sysv/linux/arm/umount.c: Remove file.
* sysdeps/unix/sysv/linux/hppa/umount.c: Likewise.
* sysdeps/unix/sysv/linux/ia64/umount.c: Likewise.
* sysdeps/unix/sysv/linux/mips/mips64/umount.c: Likewise.
* sysdeps/unix/sysv/linux/powerpc/powerpc64/umount.c: Likewise.
* sysdeps/unix/sysv/linux/umount.S: Likewise.
* sysdeps/unix/sysv/linux/x86_64/umount.c: Likewise.
2018-03-26 Andreas Schwab <schwab@suse.de>
* elf/elf.h (R_RISCV_BRANCH, R_RISCV_JAL, R_RISCV_CALL)

30
sysdeps/unix/sysv/linux/arm/umount.c
View File

@ -1,30 +0,0 @@
/* Copyright (C) 2000-2018 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by David Huggins-Daines <dhd@debian.org>, 2000.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library. If not, see
<http://www.gnu.org/licenses/>. */
/* Since we don't have an oldumount system call, do what the kernel
does down here. */
extern long int __umount2 (const char *name, int flags);
long int
__umount (const char *name)
{
return __umount2 (name, 0);
}
weak_alias (__umount, umount);

1
sysdeps/unix/sysv/linux/hppa/umount.c
View File

@ -1 +0,0 @@
#include <sysdeps/unix/sysv/linux/mips/mips64/umount.c>

29
sysdeps/unix/sysv/linux/ia64/umount.c
View File

@ -1,29 +0,0 @@
/* umount system call for Linux/ia64.
Copyright (C) 2003-2018 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
#include <sys/mount.h>
#include <errno.h>
#include <sysdep.h>
/* Unmount a filesystem. */
int
umount (const char *special_file)
{
return INLINE_SYSCALL (umount, 2, special_file, 0);
}

30
sysdeps/unix/sysv/linux/mips/mips64/umount.c
View File

@ -1,30 +0,0 @@
/* Copyright (C) 2000-2018 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by David Huggins-Daines <dhd@debian.org>, 2000.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library. If not, see
<http://www.gnu.org/licenses/>. */
/* Since we don't have an oldumount system call, do what the kernel
does down here. */
extern long int __umount2 (const char *name, int flags);
long int
__umount (const char *name)
{
return __umount2 (name, 0);
}
weak_alias (__umount, umount);

1
sysdeps/unix/sysv/linux/powerpc/powerpc64/umount.c
View File

@ -1 +0,0 @@
#include <sysdeps/unix/sysv/linux/x86_64/umount.c>

12
sysdeps/unix/sysv/linux/umount.S
View File

@ -1,12 +0,0 @@
/* This hack is necessary since the kernel people are making "strange"
changes. They simply rename old system calls. */
#include <sysdep.h>
#ifdef __NR_oldumount
PSEUDO (__umount, oldumount, 1)
#else
PSEUDO (__umount, umount, 1)
#endif
ret
PSEUDO_END(__umount)
weak_alias (__umount, umount)

0
sysdeps/unix/sysv/linux/generic/umount.c → sysdeps/unix/sysv/linux/umount.c
View File

30
sysdeps/unix/sysv/linux/x86_64/umount.c
View File

@ -1,30 +0,0 @@
/* Copyright (C) 2000-2018 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by David Huggins-Daines <dhd@debian.org>, 2000.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
/* Since we don't have an oldumount system call, do what the kernel
does down here. */
extern long int __umount2 (const char *name, int flags);
long int
__umount (const char *name)
{
return __umount2 (name, 0);
}
weak_alias (__umount, umount);