db07609875
segfaults from bnc#710486 due to unchecked usage of return value of open_ctree() [fixed compilation warnings] - pull upstream, replace existing patches, spec update - update 'restore' utility - lzo support - tools may now take earlies superblock when opening the fs - other fixes - pull integration-20111030 branch - mkfs: force mkfs if desired - other fixes - add btrfs-dump-super to mkinitrd - other fixes - skip non-existent devices or without media - documentation updates - scrubbing single device - graceful error handling when opening fs fails - updated mkinitrd script to scan devices before mount (bnc#727383) OBS-URL: https://build.opensuse.org/package/show/filesystems/btrfsprogs?expand=0&rev=115
33 lines
1.2 KiB
Diff
33 lines
1.2 KiB
Diff
From 243a10fc066200621fbdee91eb28a53f5cc91d81 Mon Sep 17 00:00:00 2001
|
|
From: Tsutomu Itoh <t-itoh@jp.fujitsu.com>
|
|
Date: Tue, 1 Nov 2011 12:20:42 +0900
|
|
Subject: [PATCH 135/138] Btrfs-progs: fix compiler warning of extent-tree.c
|
|
|
|
In recovery-beta, following compiler warning was displayed.
|
|
|
|
gcc -Wp,-MMD,./.extent-tree.o.d,-MT,extent-tree.o -Wall -D_FILE_OFFSET_BITS=64 -D_FORTIFY_SOURCE=2 -g -O0 -c extent-tree.c
|
|
extent-tree.c: In function 'lookup_inline_extent_backref':
|
|
extent-tree.c:1071: warning: format '%u' expects type 'unsigned int', but argument 3 has type 'long unsigned int'
|
|
|
|
Signed-off-by: Tsutomu Itoh <t-itoh@jp.fujitsu.com>
|
|
---
|
|
extent-tree.c | 2 +-
|
|
1 files changed, 1 insertions(+), 1 deletions(-)
|
|
|
|
diff --git a/extent-tree.c b/extent-tree.c
|
|
index 5bed3c2..5144d57 100644
|
|
--- a/extent-tree.c
|
|
+++ b/extent-tree.c
|
|
@@ -1068,7 +1068,7 @@ static int lookup_inline_extent_backref(struct btrfs_trans_handle *trans,
|
|
#endif
|
|
if (item_size < sizeof(*ei)) {
|
|
printf("Size is %u, needs to be %u, slot %d\n", item_size,
|
|
- sizeof(*ei), path->slots[0]);
|
|
+ (u32)sizeof(*ei), path->slots[0]);
|
|
btrfs_print_leaf(root, leaf);
|
|
return -EINVAL;
|
|
}
|
|
--
|
|
1.7.6.233.gd79bc
|
|
|