sbrabec/util-linux
SHA256
1
0
Fork 0
forked from pool/util-linux
Code Pull Requests Activity

Accepting request 205813 from Base:System

Browse Source 
- blkdiscard-BLKSSZGET-fills-in-an-int.patch: Fix type mismatch in
  blkdiscard (forwarded request 205643 from AndreasSchwab)

OBS-URL: https://build.opensuse.org/request/show/205813
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/util-linux?expand=0&rev=171
This commit is contained in:
Stephan Kulow 2013-11-05 12:53:50 +00:00 committed by Git OBS Bridge
commit a536d03e78
3 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
blkdiscard-BLKSSZGET-fills-in-an-int.patch Normal file
View File

@ -0,0 +1,27 @@
Subject: [PATCH] blkdiscard: BLKSSZGET fills in an int, not a uint64
Message-ID: 1383435966-29337-1-git-send-email-tytso@mit.edu
Reported-by: Jason Cipriani <jason.cipriani@gmail.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
---
sys-utils/blkdiscard.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-utils/blkdiscard.c b/sys-utils/blkdiscard.c
index af9ed66..2ddcdb1 100644
--- a/sys-utils/blkdiscard.c
+++ b/sys-utils/blkdiscard.c
@@ -70,8 +70,8 @@ static void __attribute__((__noreturn__)) usage(FILE *out)
int main(int argc, char **argv)
{
char *path;
- int c, fd, verbose = 0, secure = 0;
- uint64_t end, blksize, secsize, range[2];
+ int c, fd, verbose = 0, secure = 0, secsize;
+ uint64_t end, blksize, range[2];
struct stat sb;
static const struct option longopts[] = {
--
1.7.12.rc0.22.gcdd159b

6
util-linux.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sun Nov 3 12:53:34 UTC 2013 - schwab@linux-m68k.org
- blkdiscard-BLKSSZGET-fills-in-an-int.patch: Fix type mismatch in
blkdiscard
-------------------------------------------------------------------
Fri Oct 25 18:52:01 CEST 2013 - sbrabec@suse.cz

3
util-linux.spec
View File

@ -108,6 +108,8 @@ Patch7: more-check-for-buffer-size-when-write-multibyte-char.patch
Patch8: more-guarantee-space-for-multibyte.patch
# disable encryption
Patch12: util-linux-2.23.1-noenc-suse.diff
# PATCH-FIX-UPSTREAM blkdiscard-BLKSSZGET-fills-in-an-int.patch tytso@mit.edu
Patch13: blkdiscard-BLKSSZGET-fills-in-an-int.patch
# hack for boot.localfs
Patch20: util-linux-HACK-boot.localfs.diff
@ -229,6 +231,7 @@ xzcat %{S:0} | %gpg_verify %{S:12} -
%patch7 -p1
%patch8 -p1
%patch12 -p1
%patch13 -p1
#
%patch20 -p1
#