diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2000-04-15 19:21:10 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2000-04-15 19:21:10 +0000 |
| commit | afdda55ad55b49ee46e42976c42978460907baad (patch) | |
| tree | aab28263e8088cf18d978a5ee967a21f2232eeea | |
| parent | 150f740ace60e238094cde1ecf03e5c1c0e0d3ff (diff) | |
| download | glibc-afdda55ad55b49ee46e42976c42978460907baad.tar.gz glibc-afdda55ad55b49ee46e42976c42978460907baad.tar.xz glibc-afdda55ad55b49ee46e42976c42978460907baad.zip | |
Update.
2000-04-14 Andreas Jaeger <aj@suse.de> * sysdeps/unix/sysv/linux/shm_open.c: Include linux_fsinfo for SHMFS_SUPER_MAGIC. Remove definition of SHMFS_SUPER_MAGIC. * sysdeps/unix/sysv/linux/linux_fsinfo.h (SHMFS_SUPER_MAGIC): Added.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/linux_fsinfo.h | 5 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/shm_open.c | 7 |
3 files changed, 12 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog index b27d197ef2..b13f979443 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2000-04-14 Andreas Jaeger <aj@suse.de> + + * sysdeps/unix/sysv/linux/shm_open.c: Include linux_fsinfo for + SHMFS_SUPER_MAGIC. Remove definition of SHMFS_SUPER_MAGIC. + + * sysdeps/unix/sysv/linux/linux_fsinfo.h (SHMFS_SUPER_MAGIC): Added. + 2000-04-15 Ulrich Drepper <drepper@redhat.com> * sysdeps/unix/sysv/linux/alpha/adjtime.c: Fix typo in diff --git a/sysdeps/unix/sysv/linux/linux_fsinfo.h b/sysdeps/unix/sysv/linux/linux_fsinfo.h index 774b87ce22..4a100e3f37 100644 --- a/sysdeps/unix/sysv/linux/linux_fsinfo.h +++ b/sysdeps/unix/sysv/linux/linux_fsinfo.h @@ -1,5 +1,5 @@ /* Constants from kernel header for various FSes. - Copyright (C) 1998, 1999 Free Software Foundation, Inc. + Copyright (C) 1998, 1999, 2000 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 @@ -98,6 +98,9 @@ /* Constants that identify the `xenix' filesystem. */ #define XENIX_SUPER_MAGIC 0x012ff7b4 +/* Constant that identifies the `shm' filesystem. */ +#define SHMFS_SUPER_MAGIC 0x02011994 + /* Maximum link counts. */ #define COH_LINK_MAX 10000 #define EXT2_LINK_MAX 32000 diff --git a/sysdeps/unix/sysv/linux/shm_open.c b/sysdeps/unix/sysv/linux/shm_open.c index ca24424b78..774775b6e0 100644 --- a/sysdeps/unix/sysv/linux/shm_open.c +++ b/sysdeps/unix/sysv/linux/shm_open.c @@ -27,14 +27,9 @@ #include <sys/mman.h> #include <sys/statfs.h> #include <bits/libc-lock.h> +#include "linux_fsinfo.h" -/* XXX Currently the Linux kernel sources do not define a super magic number - for the shmfs and the kernel assigns the value 0 to f_type. */ -#ifndef SHMFS_SUPER_MAGIC -# define SHMFS_SUPER_MAGIC 0 -#endif - /* Mount point of the shared memory filesystem. */ static struct { |