rpms/e2fsprogs/devel e2fsprogs-1.40.8-blkid-swap-tests.patch, 1.1, 1.2
Eric Sandeen (sandeen)
fedora-extras-commits at redhat.com
Fri Apr 18 15:24:39 UTC 2008
Author: sandeen
Update of /cvs/pkgs/rpms/e2fsprogs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17000
Modified Files:
e2fsprogs-1.40.8-blkid-swap-tests.patch
Log Message:
fix endian issue on patch
e2fsprogs-1.40.8-blkid-swap-tests.patch:
Index: e2fsprogs-1.40.8-blkid-swap-tests.patch
===================================================================
RCS file: /cvs/pkgs/rpms/e2fsprogs/devel/e2fsprogs-1.40.8-blkid-swap-tests.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- e2fsprogs-1.40.8-blkid-swap-tests.patch 18 Apr 2008 14:57:02 -0000 1.1
+++ e2fsprogs-1.40.8-blkid-swap-tests.patch 18 Apr 2008 15:24:31 -0000 1.2
@@ -27,13 +27,14 @@
unsigned char *buf __BLKID_ATTR((unused)))
{
struct swap_id_block *sws;
-@@ -843,6 +843,11 @@ static int probe_swap1(struct blkid_probe *probe,
+@@ -843,6 +843,12 @@ static int probe_swap1(struct blkid_probe *probe,
if (!sws)
return 1;
+ /* check for wrong version or zeroed pagecount, for sanity */
+ if (!memcmp(id->bim_magic, "SWAPSPACE2", id->bim_len) &&
-+ (sws->sws_version != 1 || sws->sws_lastpage == 0))
++ (blkid_le32(sws->sws_version) != 1 ||
++ sws->sws_lastpage == 0))
+ return 1;
+
/* arbitrary sanity check.. is there any garbage down there? */
More information about the fedora-extras-commits
mailing list