wok-next annotate btrfs-progs/stuff/btrfs-progs-build-fixes.patch @ rev 12767

Up: dovecot to 2.1.6.
author Christopher Rogers <slaxemulator@gmail.com>
date Sat May 12 11:29:42 2012 +0000 (2012-05-12)
parents
children
rev   line source
slaxemulator@8810 1 --- btrfs-progs-0.19/btrfsck.c
slaxemulator@8810 2 +++ btrfs-progs-0.19/btrfsck.c
slaxemulator@8810 3 @@ -21,6 +21,9 @@
slaxemulator@8810 4 #include <stdio.h>
slaxemulator@8810 5 #include <stdlib.h>
slaxemulator@8810 6 #include <fcntl.h>
slaxemulator@8810 7 +#include <sys/types.h>
slaxemulator@8810 8 +#include <sys/stat.h>
slaxemulator@8810 9 +#include <unistd.h>
slaxemulator@8810 10 #include "kerncompat.h"
slaxemulator@8810 11 #include "ctree.h"
slaxemulator@8810 12 #include "disk-io.h"
slaxemulator@8810 13 --- btrfs-progs-0.19/mkfs.c
slaxemulator@8810 14 +++ btrfs-progs-0.19/mkfs.c
slaxemulator@8810 15 @@ -341,7 +341,7 @@ int main(int ac, char **av)
slaxemulator@8810 16 u64 alloc_start = 0;
slaxemulator@8810 17 u64 metadata_profile = BTRFS_BLOCK_GROUP_RAID1 | BTRFS_BLOCK_GROUP_DUP;
slaxemulator@8810 18 u64 data_profile = BTRFS_BLOCK_GROUP_RAID0;
slaxemulator@8810 19 - u32 leafsize = getpagesize();
slaxemulator@8810 20 + u32 leafsize = sysconf(_SC_PAGESIZE);
slaxemulator@8810 21 u32 sectorsize = 4096;
slaxemulator@8810 22 u32 nodesize = leafsize;
slaxemulator@8810 23 u32 stripesize = 4096;
slaxemulator@8810 24 @@ -398,7 +398,7 @@ int main(int ac, char **av)
slaxemulator@8810 25 print_usage();
slaxemulator@8810 26 }
slaxemulator@8810 27 }
slaxemulator@8810 28 - sectorsize = max(sectorsize, (u32)getpagesize());
slaxemulator@8810 29 + sectorsize = max(sectorsize, (u32)sysconf(_SC_PAGESIZE));
slaxemulator@8810 30 if (leafsize < sectorsize || (leafsize & (sectorsize - 1))) {
slaxemulator@8810 31 fprintf(stderr, "Illegal leafsize %u\n", leafsize);
slaxemulator@8810 32 exit(1);