From 7250d2e5b4cd4af7cd802ae04b9b77d97f3a5a45 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Wed, 6 Nov 2013 17:21:09 -0800 Subject: [PATCH] Remove pathconf's dependencies on non-uapi header files. Change-Id: I597996e4b141b009916f7ad2866dd100e08aa4d3 --- libc/bionic/pathconf.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/libc/bionic/pathconf.c b/libc/bionic/pathconf.c index 26b580ffa..cf812720b 100644 --- a/libc/bionic/pathconf.c +++ b/libc/bionic/pathconf.c @@ -25,11 +25,10 @@ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ + #include #include #include -#include -#include #include /* these may not be defined yet by our headers */ @@ -82,14 +81,12 @@ __filesizebits( struct statfs* s ) static long __link_max( struct statfs* s ) { - /* constant values were taken from official kernel headers. - * I don't think this justified bringing in et al - * into our cleaned-up kernel three - */ + // These constant values were taken from kernel headers. + // They're not available in uapi headers. static const struct { uint32_t type; int max; } knownMax[] = { - { EXT2_SUPER_MAGIC, EXT2_LINK_MAX }, - { EXT3_SUPER_MAGIC, EXT3_LINK_MAX }, + { EXT2_SUPER_MAGIC, 32000 }, + { EXT3_SUPER_MAGIC, 32000 }, { MINIX_SUPER_MAGIC, 250 }, { MINIX2_SUPER_MAGIC, 65530 }, { REISERFS_SUPER_MAGIC, 0xffff - 1000 },