aboutsummaryrefslogtreecommitdiff
path: root/sysdeps
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-04-15 19:21:10 +0000
committerUlrich Drepper <drepper@redhat.com>2000-04-15 19:21:10 +0000
commitafdda55ad55b49ee46e42976c42978460907baad (patch)
treeaab28263e8088cf18d978a5ee967a21f2232eeea /sysdeps
parent150f740ace60e238094cde1ecf03e5c1c0e0d3ff (diff)
downloadglibc-afdda55ad55b49ee46e42976c42978460907baad.zip
glibc-afdda55ad55b49ee46e42976c42978460907baad.tar.gz
glibc-afdda55ad55b49ee46e42976c42978460907baad.tar.bz2
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.
Diffstat (limited to 'sysdeps')
-rw-r--r--sysdeps/unix/sysv/linux/linux_fsinfo.h5
-rw-r--r--sysdeps/unix/sysv/linux/shm_open.c7
2 files changed, 5 insertions, 7 deletions
diff --git a/sysdeps/unix/sysv/linux/linux_fsinfo.h b/sysdeps/unix/sysv/linux/linux_fsinfo.h
index 774b87c..4a100e3 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 ca24424..774775b 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
{