diff options
| author | Elliott Hughes <enh@google.com> | 2013-11-07 01:32:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-11-07 01:32:27 +0000 |
| commit | a034e1d3e06207f079e814101bb3bce1924264e0 (patch) | |
| tree | 73ebda84047c05f50726c593ffb2924533a5cdd0 /libc | |
| parent | f945732e21e3c1291943d21fa5fee0c43792bbec (diff) | |
| parent | 7250d2e5b4cd4af7cd802ae04b9b77d97f3a5a45 (diff) | |
| download | bionic-a034e1d3e06207f079e814101bb3bce1924264e0.zip bionic-a034e1d3e06207f079e814101bb3bce1924264e0.tar.gz bionic-a034e1d3e06207f079e814101bb3bce1924264e0.tar.bz2 | |
Merge "Remove pathconf's dependencies on non-uapi header files."
Diffstat (limited to 'libc')
| -rw-r--r-- | libc/bionic/pathconf.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/libc/bionic/pathconf.c b/libc/bionic/pathconf.c index 26b580f..cf81272 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 <pathconf.h> #include <sys/vfs.h> #include <sys/limits.h> -#include <linux/ext2_fs.h> -#include <linux/ext3_fs.h> #include <errno.h> /* 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 <linux/minix_fs.h> 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 }, |