mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2025-02-23 13:09:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update.

Browse Source 
1998-08-20 19:14  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/unix/sysv/linux/Makefile [subdirs=misc] (sysdeps_routines):
	Add umount and umount2.
	* sysdeps/unix/sysv/linux/syscalls.list: Remove umount.
	* sysdeps/unix/sysv/linux/umount.S: New file.
	* sysdeps/unix/sysv/linux/umount2.S: New file.
	* sysdeps/unix/sysv/linux/sys/mount.h: Declare umount2.
	Define MNT_FORCE.
This commit is contained in:
Ulrich Drepper 1998-08-20 19:16:48 +00:00
parent df777c40c1
commit 7934cc1673
6 changed files with 44 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
1998-08-20 19:14 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/unix/sysv/linux/Makefile [subdirs=misc] (sysdeps_routines):
Add umount and umount2.
* sysdeps/unix/sysv/linux/syscalls.list: Remove umount.
* sysdeps/unix/sysv/linux/umount.S: New file.
* sysdeps/unix/sysv/linux/umount2.S: New file.
* sysdeps/unix/sysv/linux/sys/mount.h: Declare umount2.
Define MNT_FORCE.
1998-08-20 16:01 Ulrich Drepper <drepper@cygnus.com> 1998-08-20 16:01 Ulrich Drepper <drepper@cygnus.com>
* elf/ldd.sh.in: Redirect warnings and error messages to stderr. * elf/ldd.sh.in: Redirect warnings and error messages to stderr.

3
sysdeps/unix/sysv/linux/Makefile
View File

@ -9,7 +9,8 @@ CPPFLAGS += -DHAVE_LLSEEK=1
endif endif
ifeq ($(subdir),misc) ifeq ($(subdir),misc)
sysdep_routines += sysctl clone llseek getresuid getresgid sys_setresuid sysdep_routines += sysctl clone llseek getresuid getresgid sys_setresuid \
umount umount2
sysdep_headers += sys/mount.h sys/acct.h sys/sysctl.h sys/mtio.h \ sysdep_headers += sys/mount.h sys/acct.h sys/sysctl.h sys/mtio.h \
sys/io.h sys/klog.h sys/kdaemon.h \ sys/io.h sys/klog.h sys/kdaemon.h \

7
sysdeps/unix/sysv/linux/sys/mount.h
View File

@ -82,6 +82,10 @@ enum
#define BLKRAGET _IO(0x12, 99) /* Get current read ahead setting. */ #define BLKRAGET _IO(0x12, 99) /* Get current read ahead setting. */
/* Possible value for FLAGS parameter of `umount2'. */
#define MNT_FORCE /* Force unmounting. */
__BEGIN_DECLS __BEGIN_DECLS
/* Mount a filesystem. */ /* Mount a filesystem. */
@ -92,6 +96,9 @@ extern int mount __P ((__const char *__special_file, __const char *__dir,
/* Unmount a filesystem. */ /* Unmount a filesystem. */
extern int umount __P ((__const char *__special_file)); extern int umount __P ((__const char *__special_file));
/* Unmount a filesystem. Forst unmounting if FALGS is set to MNT_FORCE. */
extern int umount2 __P ((__const char *__special_file, int __flags));
__END_DECLS __END_DECLS
#endif /* _SYS_MOUNT_H */ #endif /* _SYS_MOUNT_H */

1
sysdeps/unix/sysv/linux/syscalls.list
View File

@ -82,6 +82,5 @@ sys_writev writev writev 3 __syscall_writev
sysinfo EXTRA sysinfo 1 sysinfo sysinfo EXTRA sysinfo 1 sysinfo
swapon - swapon 2 __swapon swapon swapon - swapon 2 __swapon swapon
swapoff - swapoff 1 __swapoff swapoff swapoff - swapoff 1 __swapoff swapoff
umount EXTRA umount 1 __umount umount
uselib EXTRA uselib 1 uselib uselib EXTRA uselib 1 uselib
wait4 - wait4 4 __wait4 wait4 wait4 - wait4 4 __wait4 wait4

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

@ -0,0 +1,12 @@
/* 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)

13
sysdeps/unix/sysv/linux/umount2.S Normal file
View File

@ -0,0 +1,13 @@
/* umount system call with two parameters. */
#include <sysdep.h>
#if defined __NR_oldumount || defined __NR_umount2
#ifdef __NR_oldumount
PSEUDO (__umount2, umount, 2)
#else
PSEUDO (__umount2, umount2, 2)
#endif
ret
PSEUDO_END(__umount2)
weak_alias (__umount2, umount2)
#endif