volume_id: recognize compressed hibernate swap signature

[oweals/busybox.git] / util-linux / volume_id / sysv.c

diff --git a/util-linux/volume_id/sysv.c b/util-linux/volume_id/sysv.c
index 16503325832f7e30c3186b95e2ca3fdf92971b4a..e0fa20a8c8402897e990f8ca9161c18f521aff79 100644 (file)
--- a/util-linux/volume_id/sysv.c
+++ b/util-linux/volume_id/sysv.c
@@ -23,8 +23,7 @@
 #define SYSV_NICINOD                   100
 #define SYSV_NICFREE                   50
 
-struct sysv_super
-{
+struct sysv_super {
        uint16_t        s_isize;
        uint16_t        s_pad0;
        uint32_t        s_fsize;
@@ -49,7 +48,7 @@ struct sysv_super
        uint32_t        s_state;
        uint32_t        s_magic;
        uint32_t        s_type;
-} __attribute__((__packed__));
+} PACKED;
 
 #define XENIX_NICINOD                          100
 #define XENIX_NICFREE                          100
@@ -75,7 +74,7 @@ struct xenix_super {
        uint8_t         s_fill[371];
        uint32_t        s_magic;
        uint32_t        s_type;
-} __attribute__((__packed__));
+} PACKED;
 
 #define SYSV_SUPERBLOCK_BLOCK                  0x01
 #define SYSV_MAGIC                             0xfd187e20
@@ -83,7 +82,7 @@ struct xenix_super {
 #define XENIX_MAGIC                            0x2b5544
 #define SYSV_MAX_BLOCKSIZE                     0x800
 
-int volume_id_probe_sysv(struct volume_id *id /*,uint64_t off*/)
+int FAST_FUNC volume_id_probe_sysv(struct volume_id *id /*,uint64_t off*/)
 {
 #define off ((uint64_t)0)
        struct sysv_super *vs;