linux/mdadm
1
0
Fork 0
Code Issues Activity

Merging upstream version 4.3+20241108.

Browse source 
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
Daniel Baumann 2025-02-14 06:11:53 +01:00
parent 1e24552bfc
commit 60ccb5b596
Signed by: daniel
GPG key ID: FBB4F0E80A80222F
64 changed files with 2015 additions and 1768 deletions
Download patch file Download diff file Expand all files Collapse all files

106
managemon.c
View file

@ -104,6 +104,8 @@
#endif
#include "mdadm.h"
#include "mdmon.h"
#include "xmalloc.h"
#include <sys/syscall.h>
#include <sys/socket.h>
@ -438,6 +440,39 @@ static int disk_init_and_add(struct mdinfo *disk, struct mdinfo *clone,
return 0;
}
/**
* managemon_disk_remove()- remove disk from the MD array.
* @disk: device to be removed.
* @array_devnm: the name of the array to remove disk from.
*
* It tries to remove the disk from the MD array and if it is successful then it closes all opened
* descriptors. Removing action requires suspend, it might take a while.
* Invalidating mdi->state_fd will prevent from using this device further (see duplicate_aa()).
*
* To avoid deadlock, new file descriptor is opened because monitor may already wait on
* mdddev_suspend() in kernel and keep saved descriptor locked.
*
* Returns MDADM_STATUS_SUCCESS if disk has been removed, MDADM_STATUS_ERROR otherwise.
*/
static mdadm_status_t managemon_disk_remove(struct mdinfo *disk, char *array_devnm)
{
int new_state_fd = sysfs_open2(array_devnm, disk->sys_name, "state");
if (!is_fd_valid(new_state_fd))
return MDADM_STATUS_ERROR;
if (write_attr("remove", new_state_fd) != MDADM_STATUS_SUCCESS)
return MDADM_STATUS_ERROR;
close_fd(&new_state_fd);
close_fd(&disk->state_fd);
close_fd(&disk->recovery_fd);
close_fd(&disk->bb_fd);
close_fd(&disk->ubb_fd);
return MDADM_STATUS_SUCCESS;
}
static void manage_member(struct mdstat_ent *mdstat,
struct active_array *a)
{
@ -512,15 +547,45 @@ static void manage_member(struct mdstat_ent *mdstat,
if (a->container == NULL)
return;
if (sigterm && a->info.safe_mode_delay != 1 &&
a->safe_mode_delay_fd >= 0) {
long int new_delay = 1;
char delay[10];
ssize_t len;
if (sigterm && a->info.safe_mode_delay != 1 && a->safe_mode_delay_fd >= 0)
if (write_attr("0.001", a->safe_mode_delay_fd) == MDADM_STATUS_SUCCESS)
a->info.safe_mode_delay = 1;
len = snprintf(delay, sizeof(delay), "0.%03ld\n", new_delay);
if (write(a->safe_mode_delay_fd, delay, len) == len)
a->info.safe_mode_delay = new_delay;
if (a->check_member_remove) {
bool any_removed = false;
bool all_removed = true;
struct mdinfo *disk;
for (disk = a->info.devs; disk; disk = disk->next) {
if (disk->man_disk_to_remove == false)
continue;
if (disk->mon_descriptors_not_used == false) {
/* To early, repeat later */
all_removed = false;
continue;
}
if (managemon_disk_remove(disk, a->info.sys_name)) {
all_removed = false;
continue;
}
any_removed = true;
}
if (any_removed) {
struct active_array *newa = duplicate_aa(a);
if (all_removed)
newa->check_member_remove = false;
replace_array(container, a, newa);
a = newa;
}
if (!all_removed)
return;
}
/* We don't check the array while any update is pending, as it
@ -544,8 +609,6 @@ static void manage_member(struct mdstat_ent *mdstat,
return;
newa = duplicate_aa(a);
if (!newa)
goto out;
/* prevent the kernel from activating the disk(s) before we
* finish adding them
*/
@ -575,7 +638,7 @@ static void manage_member(struct mdstat_ent *mdstat,
"sync_action", "recover") == 0)
newa->prev_action = recover;
dprintf("recovery started on %s\n", a->info.sys_name);
out:
while (newdev) {
d = newdev->next;
free(newdev);
@ -609,11 +672,9 @@ static void manage_member(struct mdstat_ent *mdstat,
if (d2)
/* already have this one */
continue;
if (!newa) {
if (!newa)
newa = duplicate_aa(a);
if (!newa)
break;
}
newd = xmalloc(sizeof(*newd));
disk_init_and_add(newd, d, newa);
}
@ -776,10 +837,8 @@ static void manage_new(struct mdstat_ent *mdstat,
error:
pr_err("failed to monitor %s\n", mdstat->metadata_version);
if (new) {
new->container = NULL;
free_aa(new);
}
new->container = NULL;
free_aa(new);
if (mdi)
sysfs_free(mdi);
}
@ -870,8 +929,15 @@ void read_sock(struct supertype *container)
return;
fl = fcntl(fd, F_GETFL, 0);
if (fl < 0) {
close_fd(&fd);
return;
}
fl |= O_NONBLOCK;
fcntl(fd, F_SETFL, fl);
if (fcntl(fd, F_SETFL, fl) < 0) {
close_fd(&fd);
return;
}
do {
msg.buf = NULL;