[PATCH] md/raid456: remove depends on CONFIG_EXPERIMENTAL

[PATCH] md/raid456: remove depends on CONFIG_EXPERIMENTAL

[Kees Cook]

The CONFIG_EXPERIMENTAL config item has not carried much meaning for a
while now and is almost always enabled by default. As agreed during the
Linux kernel summit, remove it from any "depends on" lines in Kconfigs.

Signed-off-by: Kees Cook <keescook@chromium.org>
Cc: Arjan van de Ven <arjan@linux.intel.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Alasdair G Kergon <agk@redhat.com>
---
 drivers/md/Kconfig |    1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/md/Kconfig b/drivers/md/Kconfig
index 7cdf359..0cc3a3d 100644
--- a/drivers/md/Kconfig
+++ b/drivers/md/Kconfig
@@ -158,7 +158,6 @@ config MULTICORE_RAID456
 	bool "RAID-4/RAID-5/RAID-6 Multicore processing (EXPERIMENTAL)"
 	depends on MD_RAID456
 	depends on SMP
-	depends on EXPERIMENTAL
 	---help---
 	  Enable the raid456 module to dispatch per-stripe raid operations to a
 	  thread pool.
-- 
1.7.9.5


-- 
Kees Cook
Chrome OS Security

Re: [PATCH] md/raid456: remove depends on CONFIG_EXPERIMENTAL

[Dan Williams]

On Fri, Feb 22, 2013 at 11:40 PM, Kees Cook <keescook@chromium.org> wrote:
> The CONFIG_EXPERIMENTAL config item has not carried much meaning for a
> while now and is almost always enabled by default. As agreed during the
> Linux kernel summit, remove it from any "depends on" lines in Kconfigs.
>
> Signed-off-by: Kees Cook <keescook@chromium.org>
> Cc: Arjan van de Ven <arjan@linux.intel.com>
> Cc: Dan Williams <dan.j.williams@intel.com>
> Cc: Alasdair G Kergon <agk@redhat.com>
> ---
>  drivers/md/Kconfig |    1 -
>  1 file changed, 1 deletion(-)
>
> diff --git a/drivers/md/Kconfig b/drivers/md/Kconfig
> index 7cdf359..0cc3a3d 100644
> --- a/drivers/md/Kconfig
> +++ b/drivers/md/Kconfig
> @@ -158,7 +158,6 @@ config MULTICORE_RAID456
>         bool "RAID-4/RAID-5/RAID-6 Multicore processing (EXPERIMENTAL)"
>         depends on MD_RAID456
>         depends on SMP
> -       depends on EXPERIMENTAL

In this case MULTICORE_RAID456 and the related code should go as
well... now that there are patches to supersede this implementation in
md-next.

--
Dan

Re: [PATCH] md/raid456: remove depends on CONFIG_EXPERIMENTAL

[Kees Cook]

On Tue, Feb 26, 2013 at 5:27 PM, Dan Williams <djbw@fb.com> wrote:
> On Fri, Feb 22, 2013 at 11:40 PM, Kees Cook <keescook@chromium.org> wrote:
>> The CONFIG_EXPERIMENTAL config item has not carried much meaning for a
>> while now and is almost always enabled by default. As agreed during the
>> Linux kernel summit, remove it from any "depends on" lines in Kconfigs.
>>
>> Signed-off-by: Kees Cook <keescook@chromium.org>
>> Cc: Arjan van de Ven <arjan@linux.intel.com>
>> Cc: Dan Williams <dan.j.williams@intel.com>
>> Cc: Alasdair G Kergon <agk@redhat.com>
>> ---
>>  drivers/md/Kconfig |    1 -
>>  1 file changed, 1 deletion(-)
>>
>> diff --git a/drivers/md/Kconfig b/drivers/md/Kconfig
>> index 7cdf359..0cc3a3d 100644
>> --- a/drivers/md/Kconfig
>> +++ b/drivers/md/Kconfig
>> @@ -158,7 +158,6 @@ config MULTICORE_RAID456
>>         bool "RAID-4/RAID-5/RAID-6 Multicore processing (EXPERIMENTAL)"
>>         depends on MD_RAID456
>>         depends on SMP
>> -       depends on EXPERIMENTAL
>
> In this case MULTICORE_RAID456 and the related code should go as
> well... now that there are patches to supersede this implementation in
> md-next.

Hrm, well as long as EXPERIMENTAL goes away, I'm happy. :) I sent this
most recent patch series based on what was living in linux-next, so if
that's changing, that's fine.

-Kees

-- 
Kees Cook
Chrome OS Security

Re: [PATCH] md/raid456: remove depends on CONFIG_EXPERIMENTAL

[NeilBrown]

[-- Attachment #1: Type: text/plain, Size: 4599 bytes --]

On Tue, 26 Feb 2013 17:27:45 -0800 Dan Williams <djbw@fb.com> wrote:

> On Fri, Feb 22, 2013 at 11:40 PM, Kees Cook <keescook@chromium.org> wrote:
> > The CONFIG_EXPERIMENTAL config item has not carried much meaning for a
> > while now and is almost always enabled by default. As agreed during the
> > Linux kernel summit, remove it from any "depends on" lines in Kconfigs.
> >
> > Signed-off-by: Kees Cook <keescook@chromium.org>
> > Cc: Arjan van de Ven <arjan@linux.intel.com>
> > Cc: Dan Williams <dan.j.williams@intel.com>
> > Cc: Alasdair G Kergon <agk@redhat.com>
> > ---
> >  drivers/md/Kconfig |    1 -
> >  1 file changed, 1 deletion(-)
> >
> > diff --git a/drivers/md/Kconfig b/drivers/md/Kconfig
> > index 7cdf359..0cc3a3d 100644
> > --- a/drivers/md/Kconfig
> > +++ b/drivers/md/Kconfig
> > @@ -158,7 +158,6 @@ config MULTICORE_RAID456
> >         bool "RAID-4/RAID-5/RAID-6 Multicore processing (EXPERIMENTAL)"
> >         depends on MD_RAID456
> >         depends on SMP
> > -       depends on EXPERIMENTAL
> 
> In this case MULTICORE_RAID456 and the related code should go as
> well... now that there are patches to supersede this implementation in
> md-next.
> 

What a good idea.

Following will be in -next shortly.

NeilBrown


From 51acbcec6c42b24482bac18e42befc822524535d Mon Sep 17 00:00:00 2001
From: NeilBrown <neilb@suse.de>
Date: Thu, 28 Feb 2013 09:08:34 +1100
Subject: [PATCH] md: remove CONFIG_MULTICORE_RAID456

This doesn't seem to actually help and we have an alternate
multi-threading approach waiting in the wings, so just get
rid of this config option and associated code.

As a bonus, we remove one use of CONFIG_EXPERIMENTAL

Cc: Dan Williams <djbw@fb.com>
Cc: Kees Cook <keescook@chromium.org>
Signed-off-by: NeilBrown <neilb@suse.de>

diff --git a/drivers/md/Kconfig b/drivers/md/Kconfig
index 91a02ee..9a10313 100644
--- a/drivers/md/Kconfig
+++ b/drivers/md/Kconfig
@@ -154,17 +154,6 @@ config MD_RAID456
 
 	  If unsure, say Y.
 
-config MULTICORE_RAID456
-	bool "RAID-4/RAID-5/RAID-6 Multicore processing (EXPERIMENTAL)"
-	depends on MD_RAID456
-	depends on SMP
-	depends on EXPERIMENTAL
-	---help---
-	  Enable the raid456 module to dispatch per-stripe raid operations to a
-	  thread pool.
-
-	  If unsure, say N.
-
 config MD_MULTIPATH
 	tristate "Multipath I/O support"
 	depends on BLK_DEV_MD
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index 19d77a0..35031c8 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -1406,7 +1406,7 @@ static void ops_run_check_pq(struct stripe_head *sh, struct raid5_percpu *percpu
 			   &sh->ops.zero_sum_result, percpu->spare_page, &submit);
 }
 
-static void __raid_run_ops(struct stripe_head *sh, unsigned long ops_request)
+static void raid_run_ops(struct stripe_head *sh, unsigned long ops_request)
 {
 	int overlap_clear = 0, i, disks = sh->disks;
 	struct dma_async_tx_descriptor *tx = NULL;
@@ -1471,36 +1471,6 @@ static void __raid_run_ops(struct stripe_head *sh, unsigned long ops_request)
 	put_cpu();
 }
 
-#ifdef CONFIG_MULTICORE_RAID456
-static void async_run_ops(void *param, async_cookie_t cookie)
-{
-	struct stripe_head *sh = param;
-	unsigned long ops_request = sh->ops.request;
-
-	clear_bit_unlock(STRIPE_OPS_REQ_PENDING, &sh->state);
-	wake_up(&sh->ops.wait_for_ops);
-
-	__raid_run_ops(sh, ops_request);
-	release_stripe(sh);
-}
-
-static void raid_run_ops(struct stripe_head *sh, unsigned long ops_request)
-{
-	/* since handle_stripe can be called outside of raid5d context
-	 * we need to ensure sh->ops.request is de-staged before another
-	 * request arrives
-	 */
-	wait_event(sh->ops.wait_for_ops,
-		   !test_and_set_bit_lock(STRIPE_OPS_REQ_PENDING, &sh->state));
-	sh->ops.request = ops_request;
-
-	atomic_inc(&sh->count);
-	async_schedule(async_run_ops, sh);
-}
-#else
-#define raid_run_ops __raid_run_ops
-#endif
-
 static int grow_one_stripe(struct r5conf *conf)
 {
 	struct stripe_head *sh;
@@ -1509,9 +1479,6 @@ static int grow_one_stripe(struct r5conf *conf)
 		return 0;
 
 	sh->raid_conf = conf;
-	#ifdef CONFIG_MULTICORE_RAID456
-	init_waitqueue_head(&sh->ops.wait_for_ops);
-	#endif
 
 	spin_lock_init(&sh->stripe_lock);
 
@@ -1630,9 +1597,6 @@ static int resize_stripes(struct r5conf *conf, int newsize)
 			break;
 
 		nsh->raid_conf = conf;
-		#ifdef CONFIG_MULTICORE_RAID456
-		init_waitqueue_head(&nsh->ops.wait_for_ops);
-		#endif
 		spin_lock_init(&nsh->stripe_lock);
 
 		list_add(&nsh->lru, &newstripes);

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 828 bytes --]

Re: [PATCH] md/raid456: remove depends on CONFIG_EXPERIMENTAL

[Kees Cook]

On Tue, Feb 26, 2013 at 5:27 PM, Dan Williams <djbw@fb.com> wrote:
> On Fri, Feb 22, 2013 at 11:40 PM, Kees Cook <keescook@chromium.org> wrote:
>> The CONFIG_EXPERIMENTAL config item has not carried much meaning for a
>> while now and is almost always enabled by default. As agreed during the
>> Linux kernel summit, remove it from any "depends on" lines in Kconfigs.
>>
>> Signed-off-by: Kees Cook <keescook@chromium.org>
>> Cc: Arjan van de Ven <arjan@linux.intel.com>
>> Cc: Dan Williams <dan.j.williams@intel.com>
>> Cc: Alasdair G Kergon <agk@redhat.com>
>> ---
>>  drivers/md/Kconfig |    1 -
>>  1 file changed, 1 deletion(-)
>>
>> diff --git a/drivers/md/Kconfig b/drivers/md/Kconfig
>> index 7cdf359..0cc3a3d 100644
>> --- a/drivers/md/Kconfig
>> +++ b/drivers/md/Kconfig
>> @@ -158,7 +158,6 @@ config MULTICORE_RAID456
>>         bool "RAID-4/RAID-5/RAID-6 Multicore processing (EXPERIMENTAL)"
>>         depends on MD_RAID456
>>         depends on SMP
>> -       depends on EXPERIMENTAL
>
> In this case MULTICORE_RAID456 and the related code should go as
> well... now that there are patches to supersede this implementation in
> md-next.

Can my original patch go through as-is for Linus's tree? Right now,
this is the last use of EXPERIMENTAL in v3.9-rc1. If we can drop it,
we can remove the config item entirely from v3.9.

-Kees

-- 
Kees Cook
Chrome OS Security

Re: [PATCH] md/raid456: remove depends on CONFIG_EXPERIMENTAL

[NeilBrown]

[-- Attachment #1: Type: text/plain, Size: 1740 bytes --]

On Mon, 4 Mar 2013 10:59:30 -0800 Kees Cook <keescook@chromium.org> wrote:

> On Tue, Feb 26, 2013 at 5:27 PM, Dan Williams <djbw@fb.com> wrote:
> > On Fri, Feb 22, 2013 at 11:40 PM, Kees Cook <keescook@chromium.org> wrote:
> >> The CONFIG_EXPERIMENTAL config item has not carried much meaning for a
> >> while now and is almost always enabled by default. As agreed during the
> >> Linux kernel summit, remove it from any "depends on" lines in Kconfigs.
> >>
> >> Signed-off-by: Kees Cook <keescook@chromium.org>
> >> Cc: Arjan van de Ven <arjan@linux.intel.com>
> >> Cc: Dan Williams <dan.j.williams@intel.com>
> >> Cc: Alasdair G Kergon <agk@redhat.com>
> >> ---
> >>  drivers/md/Kconfig |    1 -
> >>  1 file changed, 1 deletion(-)
> >>
> >> diff --git a/drivers/md/Kconfig b/drivers/md/Kconfig
> >> index 7cdf359..0cc3a3d 100644
> >> --- a/drivers/md/Kconfig
> >> +++ b/drivers/md/Kconfig
> >> @@ -158,7 +158,6 @@ config MULTICORE_RAID456
> >>         bool "RAID-4/RAID-5/RAID-6 Multicore processing (EXPERIMENTAL)"
> >>         depends on MD_RAID456
> >>         depends on SMP
> >> -       depends on EXPERIMENTAL
> >
> > In this case MULTICORE_RAID456 and the related code should go as
> > well... now that there are patches to supersede this implementation in
> > md-next.
> 
> Can my original patch go through as-is for Linus's tree? Right now,
> this is the last use of EXPERIMENTAL in v3.9-rc1. If we can drop it,
> we can remove the config item entirely from v3.9.

My pull request which removes CONFIG_MULTICORE_RAID456 completely was a little
late and missed -rc1.  Hopefully it will appear soon.
But if it isn't gone by -rc2, I have no objection to your patch going in then.

NeilBrown

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 828 bytes --]

Re: [PATCH] md/raid456: remove depends on CONFIG_EXPERIMENTAL

[Kees Cook]

On Mon, Mar 4, 2013 at 1:11 PM, NeilBrown <neilb@suse.de> wrote:
> On Mon, 4 Mar 2013 10:59:30 -0800 Kees Cook <keescook@chromium.org> wrote:
>
>> On Tue, Feb 26, 2013 at 5:27 PM, Dan Williams <djbw@fb.com> wrote:
>> > On Fri, Feb 22, 2013 at 11:40 PM, Kees Cook <keescook@chromium.org> wrote:
>> >> The CONFIG_EXPERIMENTAL config item has not carried much meaning for a
>> >> while now and is almost always enabled by default. As agreed during the
>> >> Linux kernel summit, remove it from any "depends on" lines in Kconfigs.
>> >>
>> >> Signed-off-by: Kees Cook <keescook@chromium.org>
>> >> Cc: Arjan van de Ven <arjan@linux.intel.com>
>> >> Cc: Dan Williams <dan.j.williams@intel.com>
>> >> Cc: Alasdair G Kergon <agk@redhat.com>
>> >> ---
>> >>  drivers/md/Kconfig |    1 -
>> >>  1 file changed, 1 deletion(-)
>> >>
>> >> diff --git a/drivers/md/Kconfig b/drivers/md/Kconfig
>> >> index 7cdf359..0cc3a3d 100644
>> >> --- a/drivers/md/Kconfig
>> >> +++ b/drivers/md/Kconfig
>> >> @@ -158,7 +158,6 @@ config MULTICORE_RAID456
>> >>         bool "RAID-4/RAID-5/RAID-6 Multicore processing (EXPERIMENTAL)"
>> >>         depends on MD_RAID456
>> >>         depends on SMP
>> >> -       depends on EXPERIMENTAL
>> >
>> > In this case MULTICORE_RAID456 and the related code should go as
>> > well... now that there are patches to supersede this implementation in
>> > md-next.
>>
>> Can my original patch go through as-is for Linus's tree? Right now,
>> this is the last use of EXPERIMENTAL in v3.9-rc1. If we can drop it,
>> we can remove the config item entirely from v3.9.
>
> My pull request which removes CONFIG_MULTICORE_RAID456 completely was a little
> late and missed -rc1.  Hopefully it will appear soon.
> But if it isn't gone by -rc2, I have no objection to your patch going in then.

Ah-ha! Okay, it sounded like the other stuff was scheduled for 3.10.
If it's going into 3.9, then I'll just wait for -rc2 before pushing
the final removal patch.

Thanks!

-Kees

-- 
Kees Cook
Chrome OS Security

Re: [PATCH] md/raid456: remove depends on CONFIG_EXPERIMENTAL

[Paul Bolle]

> Following will be in -next shortly.
> 
> NeilBrown
> 
> 
> From 51acbcec6c42b24482bac18e42befc822524535d Mon Sep 17 00:00:00 2001
> From: NeilBrown <neilb@suse.de>
> Date: Thu, 28 Feb 2013 09:08:34 +1100
> Subject: [PATCH] md: remove CONFIG_MULTICORE_RAID456
> 
> This doesn't seem to actually help and we have an alternate
> multi-threading approach waiting in the wings, so just get
> rid of this config option and associated code.
> 
> As a bonus, we remove one use of CONFIG_EXPERIMENTAL
> 
> Cc: Dan Williams <djbw@fb.com>
> Cc: Kees Cook <keescook@chromium.org>
> Signed-off-by: NeilBrown <neilb@suse.de>

That commit entered mainline in v3.9-rc2 (still as commit
51acbcec6c42b24482bac18e42befc822524535d). It missed one instance of
CONFIG_MULTICORE_RAID456, so this additional patch is needed (which also
cleans that macro from two defconfig files). Compile tested, by the way.


Paul Bolle

From ab10e19eeca5ae271ae965418ff736db0230aab6 Mon Sep 17 00:00:00 2001
From: Paul Bolle <pebolle@tiscali.nl>
Date: Mon, 11 Mar 2013 11:16:25 +0100
Subject: [PATCH] md: remove CONFIG_MULTICORE_RAID456 entirely

Once instance of this Kconfig macro remained after commit
51acbcec6c42b24482bac18e42befc822524535d ("md: remove
CONFIG_MULTICORE_RAID456"). Remove that one too. And, while we're at it,
also remove it from the defconfig files that carry it.

Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
---
 arch/tile/configs/tilegx_defconfig  | 1 -
 arch/tile/configs/tilepro_defconfig | 1 -
 drivers/md/raid5.h                  | 4 ----
 3 files changed, 6 deletions(-)

diff --git a/arch/tile/configs/tilegx_defconfig b/arch/tile/configs/tilegx_defconfig
index 8c5eff6..4768481 100644
--- a/arch/tile/configs/tilegx_defconfig
+++ b/arch/tile/configs/tilegx_defconfig
@@ -330,7 +330,6 @@ CONFIG_MD_RAID0=m
 CONFIG_MD_RAID1=m
 CONFIG_MD_RAID10=m
 CONFIG_MD_RAID456=m
-CONFIG_MULTICORE_RAID456=y
 CONFIG_MD_FAULTY=m
 CONFIG_BLK_DEV_DM=m
 CONFIG_DM_DEBUG=y
diff --git a/arch/tile/configs/tilepro_defconfig b/arch/tile/configs/tilepro_defconfig
index e7a3dfc..dd2b8f0 100644
--- a/arch/tile/configs/tilepro_defconfig
+++ b/arch/tile/configs/tilepro_defconfig
@@ -324,7 +324,6 @@ CONFIG_MD_RAID0=m
 CONFIG_MD_RAID1=m
 CONFIG_MD_RAID10=m
 CONFIG_MD_RAID456=m
-CONFIG_MULTICORE_RAID456=y
 CONFIG_MD_FAULTY=m
 CONFIG_BLK_DEV_DM=m
 CONFIG_DM_DEBUG=y
diff --git a/drivers/md/raid5.h b/drivers/md/raid5.h
index 18b2c4a..31e2ec1 100644
--- a/drivers/md/raid5.h
+++ b/drivers/md/raid5.h
@@ -221,10 +221,6 @@ struct stripe_head {
 	struct stripe_operations {
 		int 		     target, target2;
 		enum sum_check_flags zero_sum_result;
-		#ifdef CONFIG_MULTICORE_RAID456
-		unsigned long	     request;
-		wait_queue_head_t    wait_for_ops;
-		#endif
 	} ops;
 	struct r5dev {
 		/* rreq and rvec are used for the replacement device when
-- 
1.7.11.7

Re: [PATCH] md/raid456: remove depends on CONFIG_EXPERIMENTAL

[Paul Bolle]

> Following will be in -next shortly.
> 
> NeilBrown
> 
> 
> From 51acbcec6c42b24482bac18e42befc822524535d Mon Sep 17 00:00:00 2001
> From: NeilBrown <neilb@suse.de>
> Date: Thu, 28 Feb 2013 09:08:34 +1100
> Subject: [PATCH] md: remove CONFIG_MULTICORE_RAID456
> 
> This doesn't seem to actually help and we have an alternate
> multi-threading approach waiting in the wings, so just get
> rid of this config option and associated code.
> 
> As a bonus, we remove one use of CONFIG_EXPERIMENTAL
> 
> Cc: Dan Williams <djbw@fb.com>
> Cc: Kees Cook <keescook@chromium.org>
> Signed-off-by: NeilBrown <neilb@suse.de>

That commit entered mainline in v3.9-rc2 (still as commit
51acbcec6c42b24482bac18e42befc822524535d). It missed one instance of
CONFIG_MULTICORE_RAID456, so this additional patch is needed (which also
cleans that macro from two defconfig files). Compile tested, by the way.


Paul Bolle

>From ab10e19eeca5ae271ae965418ff736db0230aab6 Mon Sep 17 00:00:00 2001
From: Paul Bolle <pebolle@tiscali.nl>
Date: Mon, 11 Mar 2013 11:16:25 +0100
Subject: [PATCH] md: remove CONFIG_MULTICORE_RAID456 entirely

Once instance of this Kconfig macro remained after commit
51acbcec6c42b24482bac18e42befc822524535d ("md: remove
CONFIG_MULTICORE_RAID456"). Remove that one too. And, while we're at it,
also remove it from the defconfig files that carry it.

Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
---
 arch/tile/configs/tilegx_defconfig  | 1 -
 arch/tile/configs/tilepro_defconfig | 1 -
 drivers/md/raid5.h                  | 4 ----
 3 files changed, 6 deletions(-)

diff --git a/arch/tile/configs/tilegx_defconfig b/arch/tile/configs/tilegx_defconfig
index 8c5eff6..4768481 100644
--- a/arch/tile/configs/tilegx_defconfig
+++ b/arch/tile/configs/tilegx_defconfig
@@ -330,7 +330,6 @@ CONFIG_MD_RAID0=m
 CONFIG_MD_RAID1=m
 CONFIG_MD_RAID10=m
 CONFIG_MD_RAID456=m
-CONFIG_MULTICORE_RAID456=y
 CONFIG_MD_FAULTY=m
 CONFIG_BLK_DEV_DM=m
 CONFIG_DM_DEBUG=y
diff --git a/arch/tile/configs/tilepro_defconfig b/arch/tile/configs/tilepro_defconfig
index e7a3dfc..dd2b8f0 100644
--- a/arch/tile/configs/tilepro_defconfig
+++ b/arch/tile/configs/tilepro_defconfig
@@ -324,7 +324,6 @@ CONFIG_MD_RAID0=m
 CONFIG_MD_RAID1=m
 CONFIG_MD_RAID10=m
 CONFIG_MD_RAID456=m
-CONFIG_MULTICORE_RAID456=y
 CONFIG_MD_FAULTY=m
 CONFIG_BLK_DEV_DM=m
 CONFIG_DM_DEBUG=y
diff --git a/drivers/md/raid5.h b/drivers/md/raid5.h
index 18b2c4a..31e2ec1 100644
--- a/drivers/md/raid5.h
+++ b/drivers/md/raid5.h
@@ -221,10 +221,6 @@ struct stripe_head {
 	struct stripe_operations {
 		int 		     target, target2;
 		enum sum_check_flags zero_sum_result;
-		#ifdef CONFIG_MULTICORE_RAID456
-		unsigned long	     request;
-		wait_queue_head_t    wait_for_ops;
-		#endif
 	} ops;
 	struct r5dev {
 		/* rreq and rvec are used for the replacement device when
-- 
1.7.11.7

Re: [PATCH] md/raid456: remove depends on CONFIG_EXPERIMENTAL

[NeilBrown]

[-- Attachment #1: Type: text/plain, Size: 3257 bytes --]

On Mon, 11 Mar 2013 11:27:44 +0100 Paul Bolle <pebolle@tiscali.nl> wrote:

> > Following will be in -next shortly.
> > 
> > NeilBrown
> > 
> > 
> > From 51acbcec6c42b24482bac18e42befc822524535d Mon Sep 17 00:00:00 2001
> > From: NeilBrown <neilb@suse.de>
> > Date: Thu, 28 Feb 2013 09:08:34 +1100
> > Subject: [PATCH] md: remove CONFIG_MULTICORE_RAID456
> > 
> > This doesn't seem to actually help and we have an alternate
> > multi-threading approach waiting in the wings, so just get
> > rid of this config option and associated code.
> > 
> > As a bonus, we remove one use of CONFIG_EXPERIMENTAL
> > 
> > Cc: Dan Williams <djbw@fb.com>
> > Cc: Kees Cook <keescook@chromium.org>
> > Signed-off-by: NeilBrown <neilb@suse.de>
> 
> That commit entered mainline in v3.9-rc2 (still as commit
> 51acbcec6c42b24482bac18e42befc822524535d). It missed one instance of
> CONFIG_MULTICORE_RAID456, so this additional patch is needed (which also
> cleans that macro from two defconfig files). Compile tested, by the way.
> 
> 
> Paul Bolle

Thanks Paul.

I'll send this off to Linus some time in the next week or so.


Thanks,
NeilBrown


> 
> >From ab10e19eeca5ae271ae965418ff736db0230aab6 Mon Sep 17 00:00:00 2001
> From: Paul Bolle <pebolle@tiscali.nl>
> Date: Mon, 11 Mar 2013 11:16:25 +0100
> Subject: [PATCH] md: remove CONFIG_MULTICORE_RAID456 entirely
> 
> Once instance of this Kconfig macro remained after commit
> 51acbcec6c42b24482bac18e42befc822524535d ("md: remove
> CONFIG_MULTICORE_RAID456"). Remove that one too. And, while we're at it,
> also remove it from the defconfig files that carry it.
> 
> Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
> ---
>  arch/tile/configs/tilegx_defconfig  | 1 -
>  arch/tile/configs/tilepro_defconfig | 1 -
>  drivers/md/raid5.h                  | 4 ----
>  3 files changed, 6 deletions(-)
> 
> diff --git a/arch/tile/configs/tilegx_defconfig b/arch/tile/configs/tilegx_defconfig
> index 8c5eff6..4768481 100644
> --- a/arch/tile/configs/tilegx_defconfig
> +++ b/arch/tile/configs/tilegx_defconfig
> @@ -330,7 +330,6 @@ CONFIG_MD_RAID0=m
>  CONFIG_MD_RAID1=m
>  CONFIG_MD_RAID10=m
>  CONFIG_MD_RAID456=m
> -CONFIG_MULTICORE_RAID456=y
>  CONFIG_MD_FAULTY=m
>  CONFIG_BLK_DEV_DM=m
>  CONFIG_DM_DEBUG=y
> diff --git a/arch/tile/configs/tilepro_defconfig b/arch/tile/configs/tilepro_defconfig
> index e7a3dfc..dd2b8f0 100644
> --- a/arch/tile/configs/tilepro_defconfig
> +++ b/arch/tile/configs/tilepro_defconfig
> @@ -324,7 +324,6 @@ CONFIG_MD_RAID0=m
>  CONFIG_MD_RAID1=m
>  CONFIG_MD_RAID10=m
>  CONFIG_MD_RAID456=m
> -CONFIG_MULTICORE_RAID456=y
>  CONFIG_MD_FAULTY=m
>  CONFIG_BLK_DEV_DM=m
>  CONFIG_DM_DEBUG=y
> diff --git a/drivers/md/raid5.h b/drivers/md/raid5.h
> index 18b2c4a..31e2ec1 100644
> --- a/drivers/md/raid5.h
> +++ b/drivers/md/raid5.h
> @@ -221,10 +221,6 @@ struct stripe_head {
>  	struct stripe_operations {
>  		int 		     target, target2;
>  		enum sum_check_flags zero_sum_result;
> -		#ifdef CONFIG_MULTICORE_RAID456
> -		unsigned long	     request;
> -		wait_queue_head_t    wait_for_ops;
> -		#endif
>  	} ops;
>  	struct r5dev {
>  		/* rreq and rvec are used for the replacement device when


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 828 bytes --]