* [PATCH V2 1/1] md: Need to update superblock after changing rdev sb_flags
@ 2021-10-13 14:59 Xiao Ni
2021-10-13 15:19 ` Li Feng
0 siblings, 1 reply; 3+ messages in thread
From: Xiao Ni @ 2021-10-13 14:59 UTC (permalink / raw)
To: song; +Cc: fengli, linux-raid
It doesn't update rdev superblock flags to disk after changing these flags.
This patch does this job.
Signed-off-by: Xiao Ni <xni@redhat.com>
---
V2: calls md_update_sb directly
---
drivers/md/md.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/drivers/md/md.c b/drivers/md/md.c
index 6c0c3d0..e89eb46 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -2976,7 +2976,11 @@ state_store(struct md_rdev *rdev, const char *buf, size_t len)
* -write_error - clears WriteErrorSeen
* {,-}failfast - set/clear FailFast
*/
+
+ struct mddev *mddev = rdev->mddev;
int err = -EINVAL;
+ bool need_update_sb = false;
+
if (cmd_match(buf, "faulty") && rdev->mddev->pers) {
md_error(rdev->mddev, rdev);
if (test_bit(Faulty, &rdev->flags))
@@ -2991,7 +2995,6 @@ state_store(struct md_rdev *rdev, const char *buf, size_t len)
if (rdev->raid_disk >= 0)
err = -EBUSY;
else {
- struct mddev *mddev = rdev->mddev;
err = 0;
if (mddev_is_clustered(mddev))
err = md_cluster_ops->remove_disk(mddev, rdev);
@@ -3008,10 +3011,12 @@ state_store(struct md_rdev *rdev, const char *buf, size_t len)
} else if (cmd_match(buf, "writemostly")) {
set_bit(WriteMostly, &rdev->flags);
mddev_create_serial_pool(rdev->mddev, rdev, false);
+ need_update_sb = true;
err = 0;
} else if (cmd_match(buf, "-writemostly")) {
mddev_destroy_serial_pool(rdev->mddev, rdev, false);
clear_bit(WriteMostly, &rdev->flags);
+ need_update_sb = true;
err = 0;
} else if (cmd_match(buf, "blocked")) {
set_bit(Blocked, &rdev->flags);
@@ -3037,9 +3042,11 @@ state_store(struct md_rdev *rdev, const char *buf, size_t len)
err = 0;
} else if (cmd_match(buf, "failfast")) {
set_bit(FailFast, &rdev->flags);
+ need_update_sb = true;
err = 0;
} else if (cmd_match(buf, "-failfast")) {
clear_bit(FailFast, &rdev->flags);
+ need_update_sb = true;
err = 0;
} else if (cmd_match(buf, "-insync") && rdev->raid_disk >= 0 &&
!test_bit(Journal, &rdev->flags)) {
@@ -3118,6 +3125,8 @@ state_store(struct md_rdev *rdev, const char *buf, size_t len)
clear_bit(ExternalBbl, &rdev->flags);
err = 0;
}
+ if (need_update_sb)
+ md_update_sb(mddev, 1);
if (!err)
sysfs_notify_dirent_safe(rdev->sysfs_state);
return err ? err : len;
--
2.7.5
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH V2 1/1] md: Need to update superblock after changing rdev sb_flags
2021-10-13 14:59 [PATCH V2 1/1] md: Need to update superblock after changing rdev sb_flags Xiao Ni
@ 2021-10-13 15:19 ` Li Feng
2021-10-13 17:26 ` Song Liu
0 siblings, 1 reply; 3+ messages in thread
From: Li Feng @ 2021-10-13 15:19 UTC (permalink / raw)
To: Xiao Ni; +Cc: Song Liu, open list:SOFTWARE RAID (Multiple Disks) SUPPORT
Looks good. Feel free to add:
Reviewed-by: Li Feng <fengli@smartx.com>
Xiao Ni <xni@redhat.com> 于2021年10月13日周三 下午10:59写道：
>
> It doesn't update rdev superblock flags to disk after changing these flags.
> This patch does this job.
>
> Signed-off-by: Xiao Ni <xni@redhat.com>
> ---
> V2: calls md_update_sb directly
> ---
> drivers/md/md.c | 11 ++++++++++-
> 1 file changed, 10 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/md/md.c b/drivers/md/md.c
> index 6c0c3d0..e89eb46 100644
> --- a/drivers/md/md.c
> +++ b/drivers/md/md.c
> @@ -2976,7 +2976,11 @@ state_store(struct md_rdev *rdev, const char *buf, size_t len)
> * -write_error - clears WriteErrorSeen
> * {,-}failfast - set/clear FailFast
> */
> +
> + struct mddev *mddev = rdev->mddev;
> int err = -EINVAL;
> + bool need_update_sb = false;
> +
> if (cmd_match(buf, "faulty") && rdev->mddev->pers) {
> md_error(rdev->mddev, rdev);
> if (test_bit(Faulty, &rdev->flags))
> @@ -2991,7 +2995,6 @@ state_store(struct md_rdev *rdev, const char *buf, size_t len)
> if (rdev->raid_disk >= 0)
> err = -EBUSY;
> else {
> - struct mddev *mddev = rdev->mddev;
> err = 0;
> if (mddev_is_clustered(mddev))
> err = md_cluster_ops->remove_disk(mddev, rdev);
> @@ -3008,10 +3011,12 @@ state_store(struct md_rdev *rdev, const char *buf, size_t len)
> } else if (cmd_match(buf, "writemostly")) {
> set_bit(WriteMostly, &rdev->flags);
> mddev_create_serial_pool(rdev->mddev, rdev, false);
> + need_update_sb = true;
> err = 0;
> } else if (cmd_match(buf, "-writemostly")) {
> mddev_destroy_serial_pool(rdev->mddev, rdev, false);
> clear_bit(WriteMostly, &rdev->flags);
> + need_update_sb = true;
> err = 0;
> } else if (cmd_match(buf, "blocked")) {
> set_bit(Blocked, &rdev->flags);
> @@ -3037,9 +3042,11 @@ state_store(struct md_rdev *rdev, const char *buf, size_t len)
> err = 0;
> } else if (cmd_match(buf, "failfast")) {
> set_bit(FailFast, &rdev->flags);
> + need_update_sb = true;
> err = 0;
> } else if (cmd_match(buf, "-failfast")) {
> clear_bit(FailFast, &rdev->flags);
> + need_update_sb = true;
> err = 0;
> } else if (cmd_match(buf, "-insync") && rdev->raid_disk >= 0 &&
> !test_bit(Journal, &rdev->flags)) {
> @@ -3118,6 +3125,8 @@ state_store(struct md_rdev *rdev, const char *buf, size_t len)
> clear_bit(ExternalBbl, &rdev->flags);
> err = 0;
> }
> + if (need_update_sb)
> + md_update_sb(mddev, 1);
> if (!err)
> sysfs_notify_dirent_safe(rdev->sysfs_state);
> return err ? err : len;
> --
> 2.7.5
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH V2 1/1] md: Need to update superblock after changing rdev sb_flags
2021-10-13 15:19 ` Li Feng
@ 2021-10-13 17:26 ` Song Liu
0 siblings, 0 replies; 3+ messages in thread
From: Song Liu @ 2021-10-13 17:26 UTC (permalink / raw)
To: Li Feng; +Cc: Xiao Ni, open list:SOFTWARE RAID (Multiple Disks) SUPPORT
On Wed, Oct 13, 2021 at 8:19 AM Li Feng <fengli@smartx.com> wrote:
>
> Looks good. Feel free to add:
>
> Reviewed-by: Li Feng <fengli@smartx.com>
>
>
> Xiao Ni <xni@redhat.com> 于2021年10月13日周三 下午10:59写道：
>
>
> >
> > It doesn't update rdev superblock flags to disk after changing these flags.
> > This patch does this job.
> >
> > Signed-off-by: Xiao Ni <xni@redhat.com>
I updated the commit log and applied it to md-next.
Thanks,
Song
> > ---
> > V2: calls md_update_sb directly
> > ---
> > drivers/md/md.c | 11 ++++++++++-
> > 1 file changed, 10 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/md/md.c b/drivers/md/md.c
> > index 6c0c3d0..e89eb46 100644
> > --- a/drivers/md/md.c
> > +++ b/drivers/md/md.c
> > @@ -2976,7 +2976,11 @@ state_store(struct md_rdev *rdev, const char *buf, size_t len)
> > * -write_error - clears WriteErrorSeen
> > * {,-}failfast - set/clear FailFast
> > */
> > +
> > + struct mddev *mddev = rdev->mddev;
> > int err = -EINVAL;
> > + bool need_update_sb = false;
> > +
> > if (cmd_match(buf, "faulty") && rdev->mddev->pers) {
> > md_error(rdev->mddev, rdev);
> > if (test_bit(Faulty, &rdev->flags))
> > @@ -2991,7 +2995,6 @@ state_store(struct md_rdev *rdev, const char *buf, size_t len)
> > if (rdev->raid_disk >= 0)
> > err = -EBUSY;
> > else {
> > - struct mddev *mddev = rdev->mddev;
> > err = 0;
> > if (mddev_is_clustered(mddev))
> > err = md_cluster_ops->remove_disk(mddev, rdev);
> > @@ -3008,10 +3011,12 @@ state_store(struct md_rdev *rdev, const char *buf, size_t len)
> > } else if (cmd_match(buf, "writemostly")) {
> > set_bit(WriteMostly, &rdev->flags);
> > mddev_create_serial_pool(rdev->mddev, rdev, false);
> > + need_update_sb = true;
> > err = 0;
> > } else if (cmd_match(buf, "-writemostly")) {
> > mddev_destroy_serial_pool(rdev->mddev, rdev, false);
> > clear_bit(WriteMostly, &rdev->flags);
> > + need_update_sb = true;
> > err = 0;
> > } else if (cmd_match(buf, "blocked")) {
> > set_bit(Blocked, &rdev->flags);
> > @@ -3037,9 +3042,11 @@ state_store(struct md_rdev *rdev, const char *buf, size_t len)
> > err = 0;
> > } else if (cmd_match(buf, "failfast")) {
> > set_bit(FailFast, &rdev->flags);
> > + need_update_sb = true;
> > err = 0;
> > } else if (cmd_match(buf, "-failfast")) {
> > clear_bit(FailFast, &rdev->flags);
> > + need_update_sb = true;
> > err = 0;
> > } else if (cmd_match(buf, "-insync") && rdev->raid_disk >= 0 &&
> > !test_bit(Journal, &rdev->flags)) {
> > @@ -3118,6 +3125,8 @@ state_store(struct md_rdev *rdev, const char *buf, size_t len)
> > clear_bit(ExternalBbl, &rdev->flags);
> > err = 0;
> > }
> > + if (need_update_sb)
> > + md_update_sb(mddev, 1);
> > if (!err)
> > sysfs_notify_dirent_safe(rdev->sysfs_state);
> > return err ? err : len;
> > --
> > 2.7.5
> >
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-10-13 17:27 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-10-13 14:59 [PATCH V2 1/1] md: Need to update superblock after changing rdev sb_flags Xiao Ni
2021-10-13 15:19 ` Li Feng
2021-10-13 17:26 ` Song Liu
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).