From patchwork Wed Mar 16 09:11:45 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arne Jansen X-Patchwork-Id: 638991 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p2G9BoMf029685 for ; Wed, 16 Mar 2011 09:11:51 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752362Ab1CPJLr (ORCPT ); Wed, 16 Mar 2011 05:11:47 -0400 Received: from mort.rzone.de ([81.169.144.234]:25792 "EHLO mort.rzone.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751636Ab1CPJLr (ORCPT ); Wed, 16 Mar 2011 05:11:47 -0400 Received: from gargravarr.store (gargravarr.store [192.168.42.236]) by mort.rzone.de (Postfix) with ESMTP id 99436E2F; Wed, 16 Mar 2011 10:11:45 +0100 (MET) Received: by gargravarr.store (Postfix, from userid 32466) id 8F521C075; Wed, 16 Mar 2011 10:11:45 +0100 (CET) From: Arne Jansen To: chris.mason@oracle.com, linux-btrfs@vger.kernel.org Subject: [PATCH] btrfs scrub: 32 bit compatibility issues Date: Wed, 16 Mar 2011 10:11:45 +0100 Message-Id: <1300266705-12809-1-git-send-email-sensille@gmx.net> X-Mailer: git-send-email 1.7.3.4 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Wed, 16 Mar 2011 09:11:51 +0000 (UTC) diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c index f36f5bf..ef59200 100644 --- a/fs/btrfs/scrub.c +++ b/fs/btrfs/scrub.c @@ -411,8 +411,8 @@ static void scrub_fixup(struct scrub_fixup *fixup) &multi, 0); if (ret || !multi || length < PAGE_SIZE) { printk(KERN_ERR - "scrub_fixup: btrfs_map_block failed us for %lld\n", - fixup->logical); + "scrub_fixup: btrfs_map_block failed us for %llu\n", + (unsigned long long)fixup->logical); WARN_ON(1); return; } @@ -479,7 +479,8 @@ static void scrub_fixup(struct scrub_fixup *fixup) spin_unlock(&sdev->stat_lock); if (printk_ratelimit()) - printk(KERN_ERR "btrfs: fixed up at %lld\n", fixup->logical); + printk(KERN_ERR "btrfs: fixed up at %llu\n", + (unsigned long long)fixup->logical); return; uncorrectable: @@ -489,8 +490,8 @@ uncorrectable: spin_unlock(&sdev->stat_lock); if (printk_ratelimit()) - printk(KERN_ERR "btrfs: unable to fixup at %lld\n", - fixup->logical); + printk(KERN_ERR "btrfs: unable to fixup at %llu\n", + (unsigned long long)fixup->logical); } static void scrub_bio_end_io(struct bio *bio, int err) @@ -857,7 +858,7 @@ static noinline_for_stack int scrub_stripe(struct scrub_dev *sdev, int ret; int slot; int i; - int nstripes; + u64 nstripes; int start_stripe; struct extent_buffer *l; struct btrfs_key key; @@ -1058,9 +1059,10 @@ again: if (key.objectid < logical && (flags & BTRFS_EXTENT_FLAG_TREE_BLOCK)) { printk(KERN_ERR - "btrfs scrub: tree block %lld spanning " - "stripes, ignored. logical=%lld\n", - key.objectid, logical); + "btrfs scrub: tree block %llu spanning " + "stripes, ignored. logical=%llu\n", + (unsigned long long)key.objectid, + (unsigned long long)logical); goto next; }