Re: [PATCH v2] mdadm/r5cache: allow adding journal to array without journal

[jes.sorensen@gmail.com]

Song Liu <songliubraving@fb.com> writes:
> Currently, --add-journal can be only used to recreate broken journal
> for arrays with journal since  creation. As the kernel code getting
> more mature, this constraint is no longer necessary.
>
> This patch allows --add-journal to add journal to array without
> journal.
>
> Signed-off-by: Song Liu <songliubraving@fb.com>
> ---
>  Manage.c   | 9 ---------
>  mdadm.8.in | 5 ++---
>  2 files changed, 2 insertions(+), 12 deletions(-)

Hi Song,

I spotted this one after I had already applied the first patch with
this title, so I went back and removed the original one and applied this
one instead, but now the build breaks.

When posting a v2, please send it out as a response to the patch it is
meant to replace, like this:
  git send-email --in-reply-to=<....>

Second, please put a note in the commit why this is a v2.

I am going to revert them all for now. Please send me a fresh consistent
set to apply.

Thanks,
Jes

cc -Wall -Werror -Wstrict-prototypes -Wextra -Wno-unused-parameter -ggdb -DSendmail=\""/usr/sbin/sendmail -t"\" -DCONFFILE=\"/etc/mdadm.conf\" -DCONFFILE2=\"/etc/mdadm/mdadm.conf\" -DMAP_DIR=\"/run/mdadm\" -DMAP_FILE=\"map\" -DMDMON_DIR=\"/run/mdadm\" -DFAILED_SLOTS_DIR=\"/run/mdadm/failed-slots\" -DNO_COROSYNC -DNO_DLM -DVERSION=\"4.0-10-g707cf0a\" -DVERS_DATE="\"2017-03-17\"" -DUSE_PTHREADS -DBINDIR=\"/sbin\"  -c -o Manage.o Manage.c
Manage.c: In function ‘Manage_remove_journal’:
Manage.c:199:26: error: ‘MD_SB_HAS_JOURNAL’ undeclared (first use in this function)
  if (!(array.state & (1<<MD_SB_HAS_JOURNAL))) {
                          ^~~~~~~~~~~~~~~~~
Manage.c:199:26: note: each undeclared identifier is reported only once for each function it appears in
Manage.c:203:33: error: ‘MD_SB_JOURNAL_REMOVABLE’ undeclared (first use in this function)
  } else if (!(array.state & (1<<MD_SB_JOURNAL_REMOVABLE))) {
                                 ^~~~~~~~~~~~~~~~~~~~~~~
<builtin>: recipe for target 'Manage.o' failed
make: *** [Manage.o] Error 1