diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2014-06-25 16:39:33 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2014-06-25 16:39:33 +0000 |
| commit | a4ccbc9b243926a9904624b387fb18583c3d4d4d (patch) | |
| tree | 6763cdd9dc3430294c39fba0fce5016d68e27eb4 /sysdeps/unix/sysv/linux/kernel-features.h | |
| parent | 9aea0cb842f02098d9c09b4855f883ddc8a8a97e (diff) | |
| download | glibc-a4ccbc9b243926a9904624b387fb18583c3d4d4d.tar.gz glibc-a4ccbc9b243926a9904624b387fb18583c3d4d4d.tar.xz glibc-a4ccbc9b243926a9904624b387fb18583c3d4d4d.zip | |
Remove __ASSUME_XFS_RESTRICTED_CHOWN.
This patch removes the __ASSUME_XFS_RESTRICTED_CHOWN macro, now it can be presumed to be defined unconditionally. I'm not sure if what's left of __statfs_chown_restricted is actually useful (if not, a followup could remove it), but I left it there to keep the patch conservative and avoid changing the code generated for glibc. Tested x86_64 that the disassembly of installed shared libraries is unchanged by the patch. * sysdeps/unix/sysv/linux/kernel-features.h (__ASSUME_XFS_RESTRICTED_CHOWN): Remove macro. * sysdeps/unix/sysv/linux/pathconf.c (__statfs_chown_restricted) [__ASSUME_XFS_RESTRICTED_CHOWN]: Make code unconditional. (__statfs_chown_restricted) [!__ASSUME_XFS_RESTRICTED_CHOWN]: Remove conditional code.
Diffstat (limited to 'sysdeps/unix/sysv/linux/kernel-features.h')
| -rw-r--r-- | sysdeps/unix/sysv/linux/kernel-features.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/sysdeps/unix/sysv/linux/kernel-features.h b/sysdeps/unix/sysv/linux/kernel-features.h index 3c8ea50f79..665c348829 100644 --- a/sysdeps/unix/sysv/linux/kernel-features.h +++ b/sysdeps/unix/sysv/linux/kernel-features.h @@ -228,7 +228,3 @@ #if defined __x86_64__ && __LINUX_KERNEL_VERSION >= 0x030100 # define __ASSUME_GETCPU_SYSCALL 1 #endif - -/* 2.6.29 removed the XFS restricted_chown sysctl, so it is pointless looking - for it in newer kernels. */ -#define __ASSUME_XFS_RESTRICTED_CHOWN 1 |