mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2024-11-21 01:12:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update.

Browse Source 
2000-06-09  Ulrich Drepper  <drepper@redhat.com>

	* sysdeps/unix/sysv/linux/shm_open.c (where_is_shmfs): Try harder
	to find correct mount point despite wrong information from the
	kernel.
This commit is contained in:
Ulrich Drepper 2000-06-09 17:34:27 +00:00
parent b511d8fc6b
commit 301909fbcb
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2000-06-09 Ulrich Drepper <drepper@redhat.com>
* sysdeps/unix/sysv/linux/shm_open.c (where_is_shmfs): Try harder
to find correct mount point despite wrong information from the
kernel.
2000-06-09 Jes Sorensen <jes@linuxcare.com> 2000-06-09 Jes Sorensen <jes@linuxcare.com>
* elf/dl-libc.c (__libc_dlsym): Use DL_SYMBOL_ADDRESS() to obtain * elf/dl-libc.c (__libc_dlsym): Use DL_SYMBOL_ADDRESS() to obtain

12
sysdeps/unix/sysv/linux/shm_open.c
View File

@ -38,7 +38,7 @@ static struct
} mountpoint; } mountpoint;
/* This is the default directory. */ /* This is the default directory. */
const char defaultdir[] = "/dev/shm/"; static const char defaultdir[] = "/dev/shm/";
/* Protect the `mountpoint' variable above. */ /* Protect the `mountpoint' variable above. */
__libc_once_define (static, once); __libc_once_define (static, once);
@ -82,7 +82,15 @@ where_is_shmfs (void)
{ {
/* Found it. There might be more than one place where the /* Found it. There might be more than one place where the
filesystem is mounted but one is enough for us. */ filesystem is mounted but one is enough for us. */
size_t namelen = strlen (mp->mnt_dir); size_t namelen;
/* First make sure this really is the correct entry. At least
some versions of the kernel give wrong information because
of the implicit mount of the shmfs for SysV IPC. */
if (__statfs (mp->mnt_dir, &f) != 0 || f.f_type != SHMFS_SUPER_MAGIC)
continue;
namelen = strlen (mp->mnt_dir);
if (namelen == 0) if (namelen == 0)
/* Hum, maybe some crippled entry. Keep on searching. */ /* Hum, maybe some crippled entry. Keep on searching. */