From patchwork Sat Jan 19 14:56:23 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gene Czarcinski X-Patchwork-Id: 2006781 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id AD20ADFB78 for ; Sat, 19 Jan 2013 14:56:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751427Ab3ASO4l (ORCPT ); Sat, 19 Jan 2013 09:56:41 -0500 Received: from eastrmfepo202.cox.net ([68.230.241.217]:57086 "EHLO eastrmfepo202.cox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751317Ab3ASO4j (ORCPT ); Sat, 19 Jan 2013 09:56:39 -0500 Received: from eastrmimpo209 ([68.230.241.224]) by eastrmfepo202.cox.net (InterMail vM.8.01.04.00 201-2260-137-20101110) with ESMTP id <20130119145638.YPHX6475.eastrmfepo202.cox.net@eastrmimpo209> for ; Sat, 19 Jan 2013 09:56:38 -0500 Received: from falcon.lcl ([68.100.144.189]) by eastrmimpo209 with cox id pqwU1k00S45PsQc01qwezW; Sat, 19 Jan 2013 09:56:38 -0500 X-CT-Class: Clean X-CT-Score: 0.00 X-CT-RefID: str=0001.0A010201.50FAB426.0037,ss=1,re=0.000,fgs=0 X-CT-Spam: 0 X-Authority-Analysis: v=2.0 cv=E5JPVNhl c=1 sm=1 a=xiXiwr23JuvKlkj6ngz4TA==:17 a=q-f6edFaTzMA:10 a=103jMkqsgCkA:10 a=BIJj-m-0AAAA:8 a=rZam1R82oNsA:10 a=tFgZaghUYkNnRHM36ekA:9 a=xiXiwr23JuvKlkj6ngz4TA==:117 X-CM-Score: 0.00 Authentication-Results: cox.net; auth=pass (CRAM-MD5) smtp.auth=gczarcinski@cox.net From: Gene Czarcinski To: linux-btrfs@vger.kernel.org Cc: Gene Czarcinski Subject: [PATCH 2/4] Fedora 18 - build-fixes.patch Date: Sat, 19 Jan 2013 09:56:23 -0500 Message-Id: <1358607385-21163-3-git-send-email-gene@czarc.net> X-Mailer: git-send-email 1.8.1 In-Reply-To: <1358607385-21163-1-git-send-email-gene@czarc.net> References: <1358607385-21163-1-git-send-email-gene@czarc.net> Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org --- btrfsck.c | 2 ++ mkfs.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/btrfsck.c b/btrfsck.c index a851008..6274ff7 100644 --- a/btrfsck.c +++ b/btrfsck.c @@ -22,7 +22,9 @@ #include #include #include +#include #include +#include #include #include "kerncompat.h" #include "ctree.h" diff --git a/mkfs.c b/mkfs.c index fbf8319..d123d5f 100644 --- a/mkfs.c +++ b/mkfs.c @@ -1206,7 +1206,7 @@ int main(int ac, char **av) u64 alloc_start = 0; u64 metadata_profile = 0; u64 data_profile = 0; - u32 leafsize = getpagesize(); + u32 leafsize = sysconf(_SC_PAGESIZE); u32 sectorsize = 4096; u32 nodesize = leafsize; u32 stripesize = 4096; @@ -1282,7 +1282,7 @@ int main(int ac, char **av) print_usage(); } } - sectorsize = max(sectorsize, (u32)getpagesize()); + sectorsize = max(sectorsize, (u32)sysconf(_SC_PAGESIZE)); if (check_leaf_or_node_size(leafsize, sectorsize)) exit(1); if (check_leaf_or_node_size(nodesize, sectorsize))