bkinnightskytw
/
ethercat
mirror of https://gitlab.com/bkinnightskytw/ethercat.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'lock-abstraction-fixups' into 'master' 

fix direct uses of up()/down()

See merge request etherlab.org/ethercat!55
This commit is contained in:
Florian Pose 2022-09-05 09:17:32 +00:00
parent 6af1d9a441 624872fcdb
commit 1437f8d409
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
master/ioctl.c
View File

@ -1531,14 +1531,14 @@ static ATTRIBUTES int ec_ioctl_config_flag(
return -EFAULT;
}
if (down_interruptible(&master->master_sem)) {
if (ec_lock_down_interruptible(&master->master_sem)) {
kfree(ioctl);
return -EINTR;
}
if (!(sc = ec_master_get_config_const(
master, ioctl->config_index))) {
up(&master->master_sem);
ec_lock_up(&master->master_sem);
EC_MASTER_ERR(master, "Slave config %u does not exist!\n",
ioctl->config_index);
kfree(ioctl);
@ -1547,7 +1547,7 @@ static ATTRIBUTES int ec_ioctl_config_flag(
if (!(flag = ec_slave_config_get_flag_by_pos_const(
sc, ioctl->flag_pos))) {
up(&master->master_sem);
ec_lock_up(&master->master_sem);
EC_MASTER_ERR(master, "Invalid flag position!\n");
kfree(ioctl);
return -EINVAL;
@ -1558,7 +1558,7 @@ static ATTRIBUTES int ec_ioctl_config_flag(
ioctl->key[size] = 0x00;
ioctl->value = flag->value;
up(&master->master_sem);
ec_lock_up(&master->master_sem);
if (copy_to_user((void __user *) arg, ioctl, sizeof(*ioctl))) {
kfree(ioctl);
@ -3369,18 +3369,18 @@ static ATTRIBUTES int ec_ioctl_sc_flag(
return -EFAULT;
}
if (down_interruptible(&master->master_sem)) {
if (ec_lock_down_interruptible(&master->master_sem)) {
kfree(key);
return -EINTR;
}
if (!(sc = ec_master_get_config(master, ioctl.config_index))) {
up(&master->master_sem);
ec_lock_up(&master->master_sem);
kfree(key);
return -ENOENT;
}
up(&master->master_sem); /** \todo sc could be invalidated */
ec_lock_up(&master->master_sem); /** \todo sc could be invalidated */
ret = ecrt_slave_config_flag(sc, key, ioctl.value);
kfree(key);

4
master/slave_config.c
View File

@ -1423,9 +1423,9 @@ int ecrt_slave_config_flag(ec_slave_config_t *sc, const char *key,
return ret;
}
down(&sc->master->master_sem);
ec_lock_down(&sc->master->master_sem);
list_add_tail(&flag->list, &sc->flags);
up(&sc->master->master_sem);
ec_lock_up(&sc->master->master_sem);
}
return 0;
}