diff options
| author | Andreas Dilger <adilger@shaw.ca> | 2006-06-23 02:03:14 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-23 07:42:47 -0700 |
| commit | e8f03d02080b25f53cd6bba8dc3a297803f18c01 (patch) | |
| tree | 64d2731203aa3e90273322620c3b964bba7abed9 /include | |
| parent | 6937a25cff818d32d0f9ff58a518c9ab96760aeb (diff) | |
| download | blackbird-op-linux-e8f03d02080b25f53cd6bba8dc3a297803f18c01.tar.gz blackbird-op-linux-e8f03d02080b25f53cd6bba8dc3a297803f18c01.zip | |
[PATCH] reserve space for swap label
Reserve space in the swap disk header for a LABEL and UUID to be specified.
This has been possible with util-linux-2.12b (via e2fsprogs 1.36
libblkid), and is used by at least FC3 and later. The kernel doesn't
really care about this, but the space shouldn't accidentally be used by
something else either.
Also make the on-disk structures be fixed-size types, instead of "int",
though I don't know of any architecture in use where an "int" isn't the
same size as a "__u32" (all current kernel arches have it as "unsigned
int").
Signed-off-by: Andreas Dilger <adilger@shaw.ca>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/swap.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/include/linux/swap.h b/include/linux/swap.h index aca9bfae208f..cd28ad206dae 100644 --- a/include/linux/swap.h +++ b/include/linux/swap.h @@ -48,12 +48,14 @@ union swap_header { char magic[10]; /* SWAP-SPACE or SWAPSPACE2 */ } magic; struct { - char bootbits[1024]; /* Space for disklabel etc. */ - unsigned int version; - unsigned int last_page; - unsigned int nr_badpages; - unsigned int padding[125]; - unsigned int badpages[1]; + char bootbits[1024]; /* Space for disklabel etc. */ + __u32 version; + __u32 last_page; + __u32 nr_badpages; + unsigned char sws_uuid[16]; + unsigned char sws_volume[16]; + __u32 padding[117]; + __u32 badpages[1]; } info; }; |
