@@ -4866,8 +4866,8 @@ suspend_lo_store(struct mddev *mddev, const char *buf, size_t len)
4866
4866
mddev -> pers -> quiesce (mddev , 2 );
4867
4867
} else {
4868
4868
/* Expanding suspended region - need to wait */
4869
- mddev -> pers -> quiesce (mddev , 1 );
4870
- mddev -> pers -> quiesce (mddev , 0 );
4869
+ mddev_suspend (mddev );
4870
+ mddev_resume (mddev );
4871
4871
}
4872
4872
err = 0 ;
4873
4873
unlock :
@@ -4910,8 +4910,8 @@ suspend_hi_store(struct mddev *mddev, const char *buf, size_t len)
4910
4910
mddev -> pers -> quiesce (mddev , 2 );
4911
4911
} else {
4912
4912
/* Expanding suspended region - need to wait */
4913
- mddev -> pers -> quiesce (mddev , 1 );
4914
- mddev -> pers -> quiesce (mddev , 0 );
4913
+ mddev_suspend (mddev );
4914
+ mddev_resume (mddev );
4915
4915
}
4916
4916
err = 0 ;
4917
4917
unlock :
@@ -6642,7 +6642,7 @@ static int set_bitmap_file(struct mddev *mddev, int fd)
6642
6642
struct bitmap * bitmap ;
6643
6643
6644
6644
bitmap = bitmap_create (mddev , -1 );
6645
- mddev -> pers -> quiesce (mddev , 1 );
6645
+ mddev_suspend (mddev );
6646
6646
if (!IS_ERR (bitmap )) {
6647
6647
mddev -> bitmap = bitmap ;
6648
6648
err = bitmap_load (mddev );
@@ -6652,11 +6652,11 @@ static int set_bitmap_file(struct mddev *mddev, int fd)
6652
6652
bitmap_destroy (mddev );
6653
6653
fd = -1 ;
6654
6654
}
6655
- mddev -> pers -> quiesce (mddev , 0 );
6655
+ mddev_resume (mddev );
6656
6656
} else if (fd < 0 ) {
6657
- mddev -> pers -> quiesce (mddev , 1 );
6657
+ mddev_suspend (mddev );
6658
6658
bitmap_destroy (mddev );
6659
- mddev -> pers -> quiesce (mddev , 0 );
6659
+ mddev_resume (mddev );
6660
6660
}
6661
6661
}
6662
6662
if (fd < 0 ) {
@@ -6942,15 +6942,15 @@ static int update_array_info(struct mddev *mddev, mdu_array_info_t *info)
6942
6942
mddev -> bitmap_info .space =
6943
6943
mddev -> bitmap_info .default_space ;
6944
6944
bitmap = bitmap_create (mddev , -1 );
6945
- mddev -> pers -> quiesce (mddev , 1 );
6945
+ mddev_suspend (mddev );
6946
6946
if (!IS_ERR (bitmap )) {
6947
6947
mddev -> bitmap = bitmap ;
6948
6948
rv = bitmap_load (mddev );
6949
6949
} else
6950
6950
rv = PTR_ERR (bitmap );
6951
6951
if (rv )
6952
6952
bitmap_destroy (mddev );
6953
- mddev -> pers -> quiesce (mddev , 0 );
6953
+ mddev_resume (mddev );
6954
6954
} else {
6955
6955
/* remove the bitmap */
6956
6956
if (!mddev -> bitmap ) {
@@ -6973,9 +6973,9 @@ static int update_array_info(struct mddev *mddev, mdu_array_info_t *info)
6973
6973
mddev -> bitmap_info .nodes = 0 ;
6974
6974
md_cluster_ops -> leave (mddev );
6975
6975
}
6976
- mddev -> pers -> quiesce (mddev , 1 );
6976
+ mddev_suspend (mddev );
6977
6977
bitmap_destroy (mddev );
6978
- mddev -> pers -> quiesce (mddev , 0 );
6978
+ mddev_resume (mddev );
6979
6979
mddev -> bitmap_info .offset = 0 ;
6980
6980
}
6981
6981
}
0 commit comments