diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rwxr-xr-x | configure | 11 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/sys/mount.h | 13 |
3 files changed, 19 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog index 11d9810f8a..f86d8bc3a4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-09-23 Thorsten Kukuk <kukuk@suse.de> + + * sysdeps/unix/sysv/linux/sys/mount.h: Sync MS_RMT_MASK flag + and BLK* ioctls with linux kernel headers. + 2004-09-23 Ulrich Drepper <drepper@redhat.com> * sysdeps/generic/bits/dlfcn.h: Add RTLD_DEEPBIND. diff --git a/configure b/configure index 4e0ea1b765..6f9bde759d 100755 --- a/configure +++ b/configure @@ -6842,15 +6842,10 @@ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext echo "${ECHO_T}$have_selinux" >&6 fi - if test x$with_selinux = xauto ; then + if test x$with_selinux = xyes ; then if test x$have_selinux = xno ; then - { echo "$as_me:$LINENO: WARNING: Sufficiently new SELinux library not found" >&5 -echo "$as_me: WARNING: Sufficiently new SELinux library not found" >&2;} - fi - else - if test x$have_selinux = xno ; then - { { echo "$as_me:$LINENO: error: SELinux explicitly required, and SELinux library not found" >&5 -echo "$as_me: error: SELinux explicitly required, and SELinux library not found" >&2;} + { { echo "$as_me:$LINENO: error: SELinux explicitly required, but sufficiently recent SELinux library not found" >&5 +echo "$as_me: error: SELinux explicitly required, but sufficiently recent SELinux library not found" >&2;} { (exit 1); exit 1; }; } fi fi diff --git a/sysdeps/unix/sysv/linux/sys/mount.h b/sysdeps/unix/sysv/linux/sys/mount.h index f768d4dc73..b30554987a 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 Free Software Foundation, Inc. + Copyright (C) 1996,1997,1998,1999,2000,2004 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 @@ -62,7 +62,8 @@ enum }; /* Flags that can be altered by MS_REMOUNT */ -#define MS_RMT_MASK (MS_RDONLY | MS_MANDLOCK) +#define MS_RMT_MASK (MS_RDONLY|MS_SYNCHRONOUS|MS_MANDLOCK|MS_NOATIME \ + |MS_NODIRATIME) /* Magic mount flag number. Has to be or-ed to the flag values. */ @@ -82,6 +83,14 @@ enum #define BLKFLSBUF _IO(0x12, 97) /* Flush buffer cache. */ #define BLKRASET _IO(0x12, 98) /* Set read ahead for block device. */ #define BLKRAGET _IO(0x12, 99) /* Get current read ahead setting. */ +#define BLKFRASET _IO(0x12,100) /* Set filesystem read-ahead. */ +#define BLKFRAGET _IO(0x12,101) /* Get filesystem read-ahead. */ +#define BLKSECTSET _IO(0x12,102) /* Set max sectors per request. */ +#define BLKSECTGET _IO(0x12,103) /* Get max sectors per request. */ +#define BLKSSZGET _IO(0x12,104) /* Get block device sector size. */ +#define BLKBSZGET _IOR(0x12,112,size_t) +#define BLKBSZSET _IOW(0x12,113,size_t) +#define BLKGETSIZE64 _IOR(0x12,114,size_t) /* return device size. */ /* Possible value for FLAGS parameter of `umount2'. */ |