| Message ID | 20220826030800.10583-1-jiaming@nfschina.com (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Song Liu |
| Headers | show |
| Series | [v3] md/raid5-cache: Resolve patch confilcts | expand |
On Thu, Aug 25, 2022 at 8:09 PM Zhang Jiaming <jiaming@nfschina.com> wrote: > > Resolve conflicts when applying patches. ^^^^^^ this is not a proper commit log. If we need something that is part of the patch/email, but not part of the commit log, we can add below > > Signed-off-by: Zhang Jiaming <jiaming@nfschina.com> Signed-off-by: ... --- git-am will remove the message here (between two '---'). --- drivers/md/raid5-cache.c | 12 ++++++------ > --- > drivers/md/raid5-cache.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/drivers/md/raid5-cache.c b/drivers/md/raid5-cache.c > index 058d82e..a4a84a0 100644 > --- a/drivers/md/raid5-cache.c > +++ b/drivers/md/raid5-cache.c > @@ -125,7 +125,7 @@ struct r5l_log { > * reclaimed. if it's 0, reclaim spaces > * used by io_units which are in > * IO_UNIT_STRIPE_END state (eg, reclaim > - * dones't wait for specific io_unit > + * doesn't wait for specific io_unit > * switching to IO_UNIT_STRIPE_END > * state) */ > wait_queue_head_t iounit_wait; > @@ -1326,12 +1326,12 @@ static void r5l_write_super_and_discard_space(struct r5l_log *log, > * Discard could zero data, so before discard we must make sure > * superblock is updated to new log tail. Updating superblock (either > * directly call md_update_sb() or depend on md thread) must hold > - * reconfig mutex. On the other hand, raid5_quiesce is called with > - * reconfig_mutex hold. The first step of raid5_quiesce() is waiting > - * for all IO finish, hence waiting for reclaim thread, while reclaim > - * thread is calling this function and waiting for reconfig mutex. So > + * reconfig_mutex. On the other hand, raid5_quiesce is called with > + * reconfig_mutex held. The first step of raid5_quiesce() is waiting > + * for all IO to finish, hence waiting for reclaim thread, while reclaim > + * thread is calling this function and waiting for reconfig_mutex. So > * there is a deadlock. We workaround this issue with a trylock. > - * FIXME: we could miss discard if we can't take reconfig mutex > + * FIXME: we could miss discard if we can't take reconfig_mutex > */ > set_mask_bits(&mddev->sb_flags, 0, > BIT(MD_SB_CHANGE_DEVS) | BIT(MD_SB_CHANGE_PENDING)); > -- > 2.11.0 >
diff --git a/drivers/md/raid5-cache.c b/drivers/md/raid5-cache.c index 058d82e..a4a84a0 100644 --- a/drivers/md/raid5-cache.c +++ b/drivers/md/raid5-cache.c @@ -125,7 +125,7 @@ struct r5l_log { * reclaimed. if it's 0, reclaim spaces * used by io_units which are in * IO_UNIT_STRIPE_END state (eg, reclaim - * dones't wait for specific io_unit + * doesn't wait for specific io_unit * switching to IO_UNIT_STRIPE_END * state) */ wait_queue_head_t iounit_wait; @@ -1326,12 +1326,12 @@ static void r5l_write_super_and_discard_space(struct r5l_log *log, * Discard could zero data, so before discard we must make sure * superblock is updated to new log tail. Updating superblock (either * directly call md_update_sb() or depend on md thread) must hold - * reconfig mutex. On the other hand, raid5_quiesce is called with - * reconfig_mutex hold. The first step of raid5_quiesce() is waiting - * for all IO finish, hence waiting for reclaim thread, while reclaim - * thread is calling this function and waiting for reconfig mutex. So + * reconfig_mutex. On the other hand, raid5_quiesce is called with + * reconfig_mutex held. The first step of raid5_quiesce() is waiting + * for all IO to finish, hence waiting for reclaim thread, while reclaim + * thread is calling this function and waiting for reconfig_mutex. So * there is a deadlock. We workaround this issue with a trylock. - * FIXME: we could miss discard if we can't take reconfig mutex + * FIXME: we could miss discard if we can't take reconfig_mutex */ set_mask_bits(&mddev->sb_flags, 0, BIT(MD_SB_CHANGE_DEVS) | BIT(MD_SB_CHANGE_PENDING));
Resolve conflicts when applying patches. Signed-off-by: Zhang Jiaming <jiaming@nfschina.com> --- drivers/md/raid5-cache.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)