* [PATCH] FIX: resolve make everything compilation error
@ 2011-12-05 12:08 Adam Kwolek
2011-12-06 0:56 ` NeilBrown
0 siblings, 1 reply; 4+ messages in thread
From: Adam Kwolek @ 2011-12-05 12:08 UTC (permalink / raw)
To: neilb; +Cc: linux-raid, ed.ciechanowski, marcin.labun, dan.j.williams
When mdadm is compiled using e.g. 'everything' option, mdasseble
compilation is broken.
Change code to enable mdasseble compilation
Signed-off-by: Adam Kwolek <adam.kwolek@intel.com>
---
mdassemble.c | 2 +-
super-intel.c | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/mdassemble.c b/mdassemble.c
index 66e480a..f5bc746 100644
--- a/mdassemble.c
+++ b/mdassemble.c
@@ -85,7 +85,7 @@ int main(int argc, char *argv[]) {
rv |= Assemble(array_list->st, array_list->devname,
array_list, NULL, NULL, 0,
readonly, runstop, NULL, NULL, 0,
- verbose, force);
+ verbose, force, 1);
}
return rv;
}
diff --git a/super-intel.c b/super-intel.c
index a0672bf..82eba7b 100644
--- a/super-intel.c
+++ b/super-intel.c
@@ -1014,12 +1014,12 @@ static unsigned long long min_acceptable_spare_size_imsm(struct supertype *st)
return rv * 512;
}
+static int is_gen_migration(struct imsm_dev *dev);
+
#ifndef MDASSEMBLE
static __u64 blocks_per_migr_unit(struct intel_super *super,
struct imsm_dev *dev);
-static int is_gen_migration(struct imsm_dev *dev);
-
static void print_imsm_dev(struct intel_super *super,
struct imsm_dev *dev,
char *uuid,
@@ -5618,6 +5618,7 @@ static int update_subarray_imsm(struct supertype *st, char *subarray,
return 0;
}
+#endif /* MDASSEMBLE */
static int is_gen_migration(struct imsm_dev *dev)
{
@@ -5632,7 +5633,6 @@ static int is_gen_migration(struct imsm_dev *dev)
return 0;
}
-#endif /* MDASSEMBLE */
static int is_rebuilding(struct imsm_dev *dev)
{
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] FIX: resolve make everything compilation error
2011-12-05 12:08 Adam Kwolek
@ 2011-12-06 0:56 ` NeilBrown
0 siblings, 0 replies; 4+ messages in thread
From: NeilBrown @ 2011-12-06 0:56 UTC (permalink / raw)
To: Adam Kwolek; +Cc: linux-raid, ed.ciechanowski, marcin.labun, dan.j.williams
[-- Attachment #1: Type: text/plain, Size: 1930 bytes --]
On Mon, 05 Dec 2011 13:08:16 +0100 Adam Kwolek <adam.kwolek@intel.com> wrote:
> When mdadm is compiled using e.g. 'everything' option, mdasseble
> compilation is broken.
>
> Change code to enable mdasseble compilation
>
> Signed-off-by: Adam Kwolek <adam.kwolek@intel.com>
> ---
>
> mdassemble.c | 2 +-
> super-intel.c | 6 +++---
> 2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/mdassemble.c b/mdassemble.c
> index 66e480a..f5bc746 100644
> --- a/mdassemble.c
> +++ b/mdassemble.c
> @@ -85,7 +85,7 @@ int main(int argc, char *argv[]) {
> rv |= Assemble(array_list->st, array_list->devname,
> array_list, NULL, NULL, 0,
> readonly, runstop, NULL, NULL, 0,
> - verbose, force);
> + verbose, force, 1);
> }
> return rv;
> }
> diff --git a/super-intel.c b/super-intel.c
> index a0672bf..82eba7b 100644
> --- a/super-intel.c
> +++ b/super-intel.c
> @@ -1014,12 +1014,12 @@ static unsigned long long min_acceptable_spare_size_imsm(struct supertype *st)
> return rv * 512;
> }
>
> +static int is_gen_migration(struct imsm_dev *dev);
> +
> #ifndef MDASSEMBLE
> static __u64 blocks_per_migr_unit(struct intel_super *super,
> struct imsm_dev *dev);
>
> -static int is_gen_migration(struct imsm_dev *dev);
> -
> static void print_imsm_dev(struct intel_super *super,
> struct imsm_dev *dev,
> char *uuid,
> @@ -5618,6 +5618,7 @@ static int update_subarray_imsm(struct supertype *st, char *subarray,
>
> return 0;
> }
> +#endif /* MDASSEMBLE */
>
> static int is_gen_migration(struct imsm_dev *dev)
> {
> @@ -5632,7 +5633,6 @@ static int is_gen_migration(struct imsm_dev *dev)
>
> return 0;
> }
> -#endif /* MDASSEMBLE */
>
> static int is_rebuilding(struct imsm_dev *dev)
> {
Applied. Thanks for testing "make everything" !
NeilBrown
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 828 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] FIX: resolve make everything compilation error
@ 2012-04-16 14:12 Lukasz Dorau
2012-04-17 2:58 ` NeilBrown
0 siblings, 1 reply; 4+ messages in thread
From: Lukasz Dorau @ 2012-04-16 14:12 UTC (permalink / raw)
To: neilb; +Cc: linux-raid, dan.j.williams, ed.ciechanowski
When mdadm is compiled using e.g. 'everything' option, mdassemble
compilation is broken.
Change code to enable mdassemble compilation.
Signed-off-by: Lukasz Dorau <lukasz.dorau@intel.com>
---
super-intel.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/super-intel.c b/super-intel.c
index ed7792d..3bfeda6 100644
--- a/super-intel.c
+++ b/super-intel.c
@@ -910,6 +910,7 @@ static unsigned long long blocks_per_member(struct imsm_map *map)
return join_u32(map->blocks_per_member_lo, map->blocks_per_member_hi);
}
+#ifndef MDASSEMBLE
static unsigned long long num_data_stripes(struct imsm_map *map)
{
if (map == NULL)
@@ -921,6 +922,7 @@ static void set_total_blocks(struct imsm_disk *disk, unsigned long long n)
{
split_ull(n, &disk->total_blocks_lo, &disk->total_blocks_hi);
}
+#endif
static void set_pba_of_lba0(struct imsm_map *map, unsigned long long n)
{
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] FIX: resolve make everything compilation error
2012-04-16 14:12 [PATCH] FIX: resolve make everything compilation error Lukasz Dorau
@ 2012-04-17 2:58 ` NeilBrown
0 siblings, 0 replies; 4+ messages in thread
From: NeilBrown @ 2012-04-17 2:58 UTC (permalink / raw)
To: Lukasz Dorau; +Cc: linux-raid, dan.j.williams, ed.ciechanowski
[-- Attachment #1: Type: text/plain, Size: 1115 bytes --]
On Mon, 16 Apr 2012 16:12:55 +0200 Lukasz Dorau <lukasz.dorau@intel.com>
wrote:
> When mdadm is compiled using e.g. 'everything' option, mdassemble
> compilation is broken.
>
> Change code to enable mdassemble compilation.
>
> Signed-off-by: Lukasz Dorau <lukasz.dorau@intel.com>
> ---
> super-intel.c | 2 ++
> 1 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/super-intel.c b/super-intel.c
> index ed7792d..3bfeda6 100644
> --- a/super-intel.c
> +++ b/super-intel.c
> @@ -910,6 +910,7 @@ static unsigned long long blocks_per_member(struct imsm_map *map)
> return join_u32(map->blocks_per_member_lo, map->blocks_per_member_hi);
> }
>
> +#ifndef MDASSEMBLE
> static unsigned long long num_data_stripes(struct imsm_map *map)
> {
> if (map == NULL)
> @@ -921,6 +922,7 @@ static void set_total_blocks(struct imsm_disk *disk, unsigned long long n)
> {
> split_ull(n, &disk->total_blocks_lo, &disk->total_blocks_hi);
> }
> +#endif
>
> static void set_pba_of_lba0(struct imsm_map *map, unsigned long long n)
> {
applied, thanks.
NeilBrown
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 828 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-04-17 2:58 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-04-16 14:12 [PATCH] FIX: resolve make everything compilation error Lukasz Dorau
2012-04-17 2:58 ` NeilBrown
-- strict thread matches above, loose matches on Subject: below --
2011-12-05 12:08 Adam Kwolek
2011-12-06 0:56 ` NeilBrown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).