diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2010-02-03 06:55:30 -0800 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2010-02-03 06:55:30 -0800 |
| commit | 1712734592ce76335572ed0b90db96652ed0f6f7 (patch) | |
| tree | 0651006f288ce9a1de5abc6f2dbd6156caa3b0d0 | |
| parent | caa6e77293d85e31dfde371b78862e9330a1478e (diff) | |
| download | glibc-1712734592ce76335572ed0b90db96652ed0f6f7.tar.gz glibc-1712734592ce76335572ed0b90db96652ed0f6f7.tar.xz glibc-1712734592ce76335572ed0b90db96652ed0f6f7.zip | |
Update constants for current kernels.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/sys/mount.h | 41 |
2 files changed, 40 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog index f895a8ca28..a700332b1e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2010-02-03 Ulrich Drepper <drepper@redhat.com> + [BZ #11235] + * sysdeps/unix/sysv/linux/sys/mount.h: Remove S_WRITE, S_APPEND, + S_IMMUTABLE. Add MS_DIRSYNC, MS_MOVE, MS_SILENT, MS_REC, + MS_POSIXACL, MS_UNBINDABLE, MS_PRIVATE, MS_SLAVE, MS_SHARED, + MS_RELATIME, MS_KERNMOUNT, MS_I_VERSION, MS_STRICTATIME, + MS_ACTIVE, and MS_NOUSER. + (MS_RMT_MASK): Update according to current kernels. + [BZ #11242] * misc/getusershell.c (initshells): Allocate one more byte in input buffer so that fgets doesn't loop undefinitely. diff --git a/sysdeps/unix/sysv/linux/sys/mount.h b/sysdeps/unix/sysv/linux/sys/mount.h index 57d440f273..a41220d14e 100644 --- a/sysdeps/unix/sysv/linux/sys/mount.h +++ b/sysdeps/unix/sysv/linux/sys/mount.h @@ -1,5 +1,5 @@ /* Header file for mounting/unmount Linux filesystems. - Copyright (C) 1996,1997,1998,1999,2000,2004 Free Software Foundation, Inc. + Copyright (C) 1996-2000, 2004, 2010 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 @@ -47,23 +47,46 @@ enum #define MS_REMOUNT MS_REMOUNT MS_MANDLOCK = 64, /* Allow mandatory locks on an FS. */ #define MS_MANDLOCK MS_MANDLOCK - S_WRITE = 128, /* Write on file/directory/symlink. */ -#define S_WRITE S_WRITE - S_APPEND = 256, /* Append-only file. */ -#define S_APPEND S_APPEND - S_IMMUTABLE = 512, /* Immutable file. */ -#define S_IMMUTABLE S_IMMUTABLE + MS_DIRSYNC = 128, /* Directory modifications are synchronous. */ +#define MS_DIRSYNC MS_DIRSYNC MS_NOATIME = 1024, /* Do not update access times. */ #define MS_NOATIME MS_NOATIME MS_NODIRATIME = 2048, /* Do not update directory access times. */ #define MS_NODIRATIME MS_NODIRATIME MS_BIND = 4096, /* Bind directory at different place. */ #define MS_BIND MS_BIND + MS_MOVE = 8192, +#define MS_MOVE MS_MOVE + MS_REC = 16384, +#define MS_REC MS_REC + MS_SILENT = 32768, +#define MS_SILENT MS_SILENT + MS_POSIXACL = 1 << 16, /* VFS does not apply the umask. */ +#define MS_POSIXACL MS_POSIXACL + MS_UNBINDABLE = 1 << 17, /* Change to unbindable. */ +#define MS_UNBINDABLE MS_UNBINDABLE + MS_PRIVATE = 1 << 18, /* Change to private. */ +#define MS_PRIVATE MS_PRIVATE + MS_SLAVE = 1 << 19, /* Change to slave. */ +#define MS_SLAVE MS_SLAVE + MS_SHARED = 1 << 20, /* Change to shared. */ +#define MS_SHARED MS_SHARED + MS_RELATIME = 1 << 21, /* Update atime relative to mtime/ctime. */ +#define MS_RELATIME MS_RELATIME + MS_KERNMOUNT = 1 << 22, /* This is a kern_mount call. */ +#define MS_KERNMOUNT MS_KERNMOUNT + MS_I_VERSION = 1 << 23, /* Update inode I_version field. */ +#define MS_I_VERSION MS_I_VERSION + MS_STRICTATIME = 1 << 24, /* Always perform atime updates. */ +#define MS_STRICTATIME MS_STRICTATIME + MS_ACTIVE = 1 << 30, +#define MS_ACTIVE MS_ACTIVE + MS_NOUSER = 1 << 31 +#define MS_NOUSER MS_NOUSER }; /* Flags that can be altered by MS_REMOUNT */ -#define MS_RMT_MASK (MS_RDONLY|MS_SYNCHRONOUS|MS_MANDLOCK|MS_NOATIME \ - |MS_NODIRATIME) +#define MS_RMT_MASK (MS_RDONLY|MS_SYNCHRONOUS|MS_MANDLOCK|MS_I_VERSION) /* Magic mount flag number. Has to be or-ed to the flag values. */ |