ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

swapon, swapheader, mkswap: move swap signature to header 

Both swapon and mkswap need to know what is valid device signature, so
share the value.

[kzak@redhat.com: - use SWAP_SIGNATURE_SZ properly in write_signature()]

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Sami Kerola 2014-04-26 00:50:30 +01:00 committed by Karel Zak
parent eb397d19e4
commit 24f83f7392
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
disk-utils/mkswap.c
View File

@ -177,7 +177,7 @@ write_signature(char *sig)
{
char *sp = (char *) signature_page;
strncpy(sp + pagesize - 10, sig, 10);
strncpy(sp + pagesize - SWAP_SIGNATURE_SZ, sig, SWAP_SIGNATURE_SZ);
}
static void
@ -611,7 +611,7 @@ main(int argc, char **argv) {
printf(_("Setting up swapspace version %d, size = %llu KiB\n"),
version, goodpages * pagesize / 1024);
write_signature("SWAPSPACE2");
write_signature(SWAP_SIGNATURE);
write_uuid_and_label(uuid, opt_label);
offset = 1024;

2
include/swapheader.h
View File

@ -4,6 +4,8 @@
#define SWAP_VERSION 1
#define SWAP_UUID_LENGTH 16
#define SWAP_LABEL_LENGTH 16
#define SWAP_SIGNATURE "SWAPSPACE2"
#define SWAP_SIGNATURE_SZ (sizeof(SWAP_SIGNATURE) - 1)
#include <stdint.h>

3
sys-utils/swapon.c
View File

@ -76,9 +76,6 @@ enum {
SIG_SWSUSPEND
};
#define SWAP_SIGNATURE "SWAPSPACE2"
#define SWAP_SIGNATURE_SZ (sizeof(SWAP_SIGNATURE) - 1)
static int all;
static int priority = -1; /* non-prioritized swap by default */
static int discard; /* don't send swap discards by default */