From: NeilBrown <neilb@suse.de>
To: Adam Kwolek <adam.kwolek@intel.com>
Cc: linux-raid@vger.kernel.org, ed.ciechanowski@intel.com,
marcin.labun@intel.com, dan.j.williams@intel.com
Subject: Re: [PATCH] FIX: resolve make everything compilation error
Date: Tue, 6 Dec 2011 11:56:59 +1100 [thread overview]
Message-ID: <20111206115659.1ea5448e@notabene.brown> (raw)
In-Reply-To: <20111205120816.30466.14434.stgit@gklab-128-013.igk.intel.com>
[-- 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 --]
next prev parent reply other threads:[~2011-12-06 0:56 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-05 12:08 [PATCH] FIX: resolve make everything compilation error Adam Kwolek
2011-12-06 0:56 ` NeilBrown [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-04-16 14:12 Lukasz Dorau
2012-04-17 2:58 ` NeilBrown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20111206115659.1ea5448e@notabene.brown \
--to=neilb@suse.de \
--cc=adam.kwolek@intel.com \
--cc=dan.j.williams@intel.com \
--cc=ed.ciechanowski@intel.com \
--cc=linux-raid@vger.kernel.org \
--cc=marcin.labun@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.