5be20c4ea7
SR: a few fixes, aimed for 13.1 RC2 - fsck updates - more mkfs sanity checks - qgroup rescan wait OBS-URL: https://build.opensuse.org/request/show/205320 OBS-URL: https://build.opensuse.org/package/show/filesystems/btrfsprogs?expand=0&rev=144
46 lines
1.1 KiB
Diff
46 lines
1.1 KiB
Diff
From 892bfedb24519d95dbe3d5cdc44d26adbc1c93dc Mon Sep 17 00:00:00 2001
|
|
From: David Sterba <dsterba@suse.cz>
|
|
Date: Tue, 9 Jul 2013 18:38:29 +0200
|
|
Subject: [PATCH 51/62] btrfs-progs: Fix getopt on arm/ppc platforms
|
|
|
|
(same as commit bb0eabc383e9a3fde7cdb02591ca88243f3e31fb)
|
|
There, 'char' is unsigned, so once assigned '-1' from getopt, it gets
|
|
the value 255. Then, it compared to '-1' gives false.
|
|
|
|
Signed-off-by: David Sterba <dsterba@suse.cz>
|
|
Signed-off-by: Chris Mason <chris.mason@fusionio.com>
|
|
---
|
|
btrfs-crc.c | 2 +-
|
|
cmds-device.c | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/btrfs-crc.c b/btrfs-crc.c
|
|
index e4cda4312700..1990534ad4d2 100644
|
|
--- a/btrfs-crc.c
|
|
+++ b/btrfs-crc.c
|
|
@@ -34,7 +34,7 @@ void usage(void)
|
|
|
|
int main(int argc, char **argv)
|
|
{
|
|
- char c;
|
|
+ int c;
|
|
unsigned long checksum = 0;
|
|
char *str;
|
|
char *buf;
|
|
diff --git a/cmds-device.c b/cmds-device.c
|
|
index 41e79d375ce4..9e7328b20a55 100644
|
|
--- a/cmds-device.c
|
|
+++ b/cmds-device.c
|
|
@@ -294,7 +294,7 @@ static int cmd_dev_stats(int argc, char **argv)
|
|
int ret;
|
|
int fdmnt;
|
|
int i;
|
|
- char c;
|
|
+ int c;
|
|
int err = 0;
|
|
__u64 flags = 0;
|
|
|
|
--
|
|
1.8.3.1
|
|
|