From patchwork Thu Apr 7 11:02:04 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Anton Blanchard X-Patchwork-Id: 692101 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 p37B2Dja023247 for ; Thu, 7 Apr 2011 11:02:14 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755429Ab1DGLCK (ORCPT ); Thu, 7 Apr 2011 07:02:10 -0400 Received: from ozlabs.org ([203.10.76.45]:58859 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754897Ab1DGLCJ convert rfc822-to-8bit (ORCPT ); Thu, 7 Apr 2011 07:02:09 -0400 Received: from kryten (ppp121-44-158-134.lns20.syd7.internode.on.net [121.44.158.134]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPSA id D1C91B6F44 for ; Thu, 7 Apr 2011 21:02:07 +1000 (EST) Date: Thu, 7 Apr 2011 21:02:04 +1000 From: Anton Blanchard To: linux-btrfs@vger.kernel.org Subject: [PATCH] btrfs-progs: cast u64 to long long to avoid printf warnings Message-ID: <20110407210204.268daefd@kryten> X-Mailer: Claws Mail 3.7.6 (GTK+ 2.22.0; i486-pc-linux-gnu) Mime-Version: 1.0 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]); Thu, 07 Apr 2011 11:02:31 +0000 (UTC) When building on ppc64 I hit a number of warnings in printf: btrfs-map-logical.c:69: error: format ‘%Lu’ expects type ‘long long unsigned int’, but argument 4 has type ‘u64’ Fix them. Signed-off-by: Anton Blanchard --- -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/btrfs-list.c b/btrfs-list.c index 93766a8..c602b87 100644 --- a/btrfs-list.c +++ b/btrfs-list.c @@ -249,7 +249,8 @@ static int resolve_root(struct root_lookup *rl, struct root_info *ri) break; } } - printf("ID %llu top level %llu path %s\n", ri->root_id, top_id, + printf("ID %llu top level %llu path %s\n", + (unsigned long long)ri->root_id, (unsigned long long)top_id, full_path); free(full_path); return 0; diff --git a/btrfs-map-logical.c b/btrfs-map-logical.c index a109c6a..9e9806d 100644 --- a/btrfs-map-logical.c +++ b/btrfs-map-logical.c @@ -65,8 +65,8 @@ struct extent_buffer *debug_read_block(struct btrfs_root *root, u64 bytenr, eb->dev_bytenr = multi->stripes[0].physical; fprintf(info_file, "mirror %d logical %Lu physical %Lu " - "device %s\n", mirror_num, bytenr, eb->dev_bytenr, - device->name); + "device %s\n", mirror_num, (unsigned long long)bytenr, + (unsigned long long)eb->dev_bytenr, device->name); kfree(multi); if (!copy || mirror_num == copy) diff --git a/btrfsctl.c b/btrfsctl.c index 92bdf39..896999f 100644 --- a/btrfsctl.c +++ b/btrfsctl.c @@ -245,7 +245,7 @@ int main(int ac, char **av) args.fd = fd; ret = ioctl(snap_fd, command, &args); } else if (command == BTRFS_IOC_DEFAULT_SUBVOL) { - printf("objectid is %llu\n", objectid); + printf("objectid is %llu\n", (unsigned long long)objectid); ret = ioctl(fd, command, &objectid); } else ret = ioctl(fd, command, &args); diff --git a/debug-tree.c b/debug-tree.c index 0525354..e8ee64e 100644 --- a/debug-tree.c +++ b/debug-tree.c @@ -166,7 +166,8 @@ int main(int ac, char **av) root->nodesize, 0); } if (!leaf) { - fprintf(stderr, "failed to read %llu\n", block_only); + fprintf(stderr, "failed to read %llu\n", + (unsigned long long)block_only); return 0; } btrfs_print_tree(root, leaf, 0); diff --git a/disk-io.c b/disk-io.c index a6e1000..5295dca 100644 --- a/disk-io.c +++ b/disk-io.c @@ -678,7 +678,8 @@ struct btrfs_root *open_ctree_fd(int fp, const char *path, u64 sb_bytenr, ~BTRFS_FEATURE_INCOMPAT_SUPP; if (features) { printk("couldn't open because of unsupported " - "option features (%Lx).\n", features); + "option features (%Lx).\n", + (unsigned long long)features); BUG_ON(1); } @@ -692,7 +693,8 @@ struct btrfs_root *open_ctree_fd(int fp, const char *path, u64 sb_bytenr, ~BTRFS_FEATURE_COMPAT_RO_SUPP; if (writes && features) { printk("couldn't open RDWR because of unsupported " - "option features (%Lx).\n", features); + "option features (%Lx).\n", + (unsigned long long)features); BUG_ON(1); } diff --git a/extent-tree.c b/extent-tree.c index b2f9bb2..3a09f2f 100644 --- a/extent-tree.c +++ b/extent-tree.c @@ -1448,7 +1448,8 @@ int btrfs_lookup_extent_info(struct btrfs_trans_handle *trans, goto out; if (ret != 0) { btrfs_print_leaf(root, path->nodes[0]); - printk("failed to find block number %Lu\n", bytenr); + printk("failed to find block number %Lu\n", + (unsigned long long)bytenr); BUG(); } diff --git a/print-tree.c b/print-tree.c index ac575d5..c673dcb 100644 --- a/print-tree.c +++ b/print-tree.c @@ -497,7 +497,7 @@ void btrfs_print_leaf(struct btrfs_root *root, struct extent_buffer *l) case BTRFS_DIR_LOG_ITEM_KEY: dlog = btrfs_item_ptr(l, i, struct btrfs_dir_log_item); printf("\t\tdir log end %Lu\n", - btrfs_dir_log_end(l, dlog)); + (unsigned long long)btrfs_dir_log_end(l, dlog)); break; case BTRFS_ORPHAN_ITEM_KEY: printf("\t\torphan item\n");