[PATCH 3/8] mkswap: remove unnecessary size check

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Signed-off-by: Sami Kerola <kerolasa@xxxxxx>
---
 disk-utils/mkswap.c  | 6 ------
 include/swapheader.h | 2 --
 2 files changed, 8 deletions(-)

diff --git a/disk-utils/mkswap.c b/disk-utils/mkswap.c
index a1b864d..b2713ab 100644
--- a/disk-utils/mkswap.c
+++ b/disk-utils/mkswap.c
@@ -115,12 +115,6 @@ write_uuid_and_label(unsigned char *uuid, char *volume_name)
 {
 	struct swap_header_v1_2 *h;
 
-	/* Sanity check */
-	if (sizeof(struct swap_header_v1_2) != SWAP_HEADER_SIZE) {
-		warnx(_("Bad swap header size, no label written."));
-		return;
-	}
-
 	h = (struct swap_header_v1_2 *) signature_page;
 	if (uuid)
 		memcpy(h->uuid, uuid, sizeof(h->uuid));
diff --git a/include/swapheader.h b/include/swapheader.h
index 1d91e41..3fce0d0 100644
--- a/include/swapheader.h
+++ b/include/swapheader.h
@@ -20,6 +20,4 @@ struct swap_header_v1_2 {
 	uint32_t      badpages[1];
 };
 
-#define SWAP_HEADER_SIZE (sizeof(struct swap_header_v1_2))
-
 #endif /* _SWAPHEADER_H */
-- 
2.1.3

--
To unsubscribe from this list: send the line "unsubscribe util-linux" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Netdev]     [Ethernet Bridging]     [Linux Wireless]     [Kernel Newbies]     [Security]     [Linux for Hams]     [Netfilter]     [Bugtraq]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux RAID]     [Linux Admin]     [Samba]

  Powered by Linux