diff options
| author | Cristian RodrÃguez <crrodriguez@opensuse.org> | 2014-05-21 18:45:19 +0200 |
|---|---|---|
| committer | NeilBrown <neilb@suse.de> | 2014-05-22 06:29:14 +0200 |
| commit | 04f903b21ad4d68aa8630433dc2b07edfbc0ad0f (patch) | |
| tree | d52c06609dbf1256ad7b616983451e939d28783e | |
| parent | Grow: fix resent grow_continue breakage. (diff) | |
| download | mdadm-04f903b21ad4d68aa8630433dc2b07edfbc0ad0f.tar.xz mdadm-04f903b21ad4d68aa8630433dc2b07edfbc0ad0f.zip | |
mdadm: Do not reimplment offsetof
Proper implementations have offsetof in stddef.h
Signed-off-by: NeilBrown <neilb@suse.de>
| -rw-r--r-- | Grow.c | 5 | ||||
| -rw-r--r-- | super-ddf.c | 5 | ||||
| -rw-r--r-- | super1.c | 4 |
3 files changed, 3 insertions, 11 deletions
@@ -24,6 +24,7 @@ #include "mdadm.h" #include "dlink.h" #include <sys/mman.h> +#include <stddef.h> #include <stdint.h> #include <signal.h> #include <sys/wait.h> @@ -34,10 +35,6 @@ #include "md_u.h" #include "md_p.h" -#ifndef offsetof -#define offsetof(t,f) ((size_t)&(((t*)0)->f)) -#endif - int restore_backup(struct supertype *st, struct mdinfo *content, int working_disks, diff --git a/super-ddf.c b/super-ddf.c index f9121995..64893e07 100644 --- a/super-ddf.c +++ b/super-ddf.c @@ -30,6 +30,7 @@ #include "mdmon.h" #include "sha1.h" #include <values.h> +#include <stddef.h> /* a non-official T10 name for creation GUIDs */ static char T10[] = "Linux-MD"; @@ -536,10 +537,6 @@ static int init_super_ddf_bvd(struct supertype *st, char *name, char *homehost, int *uuid, unsigned long long data_offset); -#ifndef offsetof -#define offsetof(t,f) ((size_t)&(((t*)0)->f)) -#endif - #if DEBUG static void pr_state(struct ddf_super *ddf, const char *msg) { @@ -22,6 +22,7 @@ * Email: <neilb@suse.de> */ +#include <stddef.h> #include "mdadm.h" /* * The version-1 superblock : @@ -133,9 +134,6 @@ struct misc_dev_info { |MD_FEATURE_NEW_OFFSET \ ) -#ifndef offsetof -#define offsetof(t,f) ((size_t)&(((t*)0)->f)) -#endif static unsigned int calc_sb_1_csum(struct mdp_superblock_1 * sb) { unsigned int disk_csum, csum; |