Skip to content

L
linux
Commit 6caf77e6 authored by Kai Germaschewski's avatar Kai Germaschewski
Browse files
Options

ISDN: Introduce get/put_slot() 

When an application needs an ISDN channel ("slot"), it now should
use get_slot() which will make sure that the corresponding driver module
doesn't unregister under us.
parent a0ba1862
Show whitespace changes
Inline Side-by-side
Showing with 68 additions and 72 deletions
drivers/isdn/i4l/isdn_common.c
View file @ 6caf77e6
...@@ -1146,7 +1146,7 @@ isdn_getnum(char **p) ...@@ -1146,7 +1146,7 @@ isdn_getnum(char **p)
} }
static struct isdn_slot * static struct isdn_slot *
isdn_minor2slot(int minor) get_slot_by_minor(int minor)
{ {
int di, ch; int di, ch;
struct isdn_driver *drv; struct isdn_driver *drv;
...@@ -1165,30 +1165,13 @@ isdn_minor2slot(int minor) ...@@ -1165,30 +1165,13 @@ isdn_minor2slot(int minor)
return NULL; return NULL;
found: found:
put_drv(drv); // FIXME!!!
return drv->slots + ch; return drv->slots + ch;
} }
static inline int static inline void
isdn_minor2drv(int minor) put_slot(struct isdn_slot *slot)
{
struct isdn_slot *slot = isdn_minor2slot(minor);
if (!slot)
return -1;
return slot->drv->di;
}
static inline int
isdn_minor2chan(int minor)
{ {
struct isdn_slot *slot = isdn_minor2slot(minor); put_drv(slot->drv);
if (!slot)
return -1;
return slot - slot->drv->slots;
} }
static char * static char *
...@@ -1197,60 +1180,77 @@ isdn_statstr(void) ...@@ -1197,60 +1180,77 @@ isdn_statstr(void)
static char istatbuf[2048]; static char istatbuf[2048];
struct isdn_slot *slot; struct isdn_slot *slot;
char *p; char *p;
int i, di, ch; int i;
sprintf(istatbuf, "idmap:\t"); sprintf(istatbuf, "idmap:\t");
p = istatbuf + strlen(istatbuf); p = istatbuf + strlen(istatbuf);
for (i = 0; i < ISDN_MAX_CHANNELS; i++) { for (i = 0; i < ISDN_MAX_CHANNELS; i++) {
slot = isdn_minor2slot(i); slot = get_slot_by_minor(i);
if (slot) if (slot) {
sprintf(p, "%s ", slot->drv->id); sprintf(p, "%s ", slot->drv->id);
else put_slot(slot);
} else {
sprintf(p, "- "); sprintf(p, "- ");
}
p = istatbuf + strlen(istatbuf); p = istatbuf + strlen(istatbuf);
} }
sprintf(p, "\nchmap:\t"); sprintf(p, "\nchmap:\t");
p = istatbuf + strlen(istatbuf); p = istatbuf + strlen(istatbuf);
for (i = 0; i < ISDN_MAX_CHANNELS; i++) { for (i = 0; i < ISDN_MAX_CHANNELS; i++) {
ch = isdn_minor2chan(i); slot = get_slot_by_minor(i);
sprintf(p, "%d ", ch); if (slot) {
sprintf(p, "%d ", slot->ch);
put_slot(slot);
} else {
sprintf(p, "-1 ");
}
p = istatbuf + strlen(istatbuf); p = istatbuf + strlen(istatbuf);
} }
sprintf(p, "\ndrmap:\t"); sprintf(p, "\ndrmap:\t");
p = istatbuf + strlen(istatbuf); p = istatbuf + strlen(istatbuf);
for (i = 0; i < ISDN_MAX_CHANNELS; i++) { for (i = 0; i < ISDN_MAX_CHANNELS; i++) {
di = isdn_minor2drv(i); slot = get_slot_by_minor(i);
sprintf(p, "%d ", di); if (slot) {
p = istatbuf + strlen(istatbuf); sprintf(p, "%d ", slot->di);
put_slot(slot);
} else {
sprintf(p, "-1 ");
}
} }
sprintf(p, "\nusage:\t"); sprintf(p, "\nusage:\t");
p = istatbuf + strlen(istatbuf); p = istatbuf + strlen(istatbuf);
for (i = 0; i < ISDN_MAX_CHANNELS; i++) { for (i = 0; i < ISDN_MAX_CHANNELS; i++) {
slot = isdn_minor2slot(i); slot = get_slot_by_minor(i);
if (slot) if (slot) {
sprintf(p, "%d ", slot->usage); sprintf(p, "%d ", slot->usage);
else put_slot(slot);
} else {
sprintf(p, "0 "); sprintf(p, "0 ");
}
p = istatbuf + strlen(istatbuf); p = istatbuf + strlen(istatbuf);
} }
sprintf(p, "\nflags:\t"); sprintf(p, "\nflags:\t");
p = istatbuf + strlen(istatbuf); p = istatbuf + strlen(istatbuf);
for (i = 0; i < ISDN_MAX_DRIVERS; i++) { for (i = 0; i < ISDN_MAX_DRIVERS; i++) {
slot = isdn_minor2slot(i); slot = get_slot_by_minor(i);
if (slot) if (slot) {
sprintf(p, "0 "); sprintf(p, "0 ");
else put_slot(slot);
} else {
sprintf(p, "? "); sprintf(p, "? ");
}
p = istatbuf + strlen(istatbuf); p = istatbuf + strlen(istatbuf);
} }
sprintf(p, "\nphone:\t"); sprintf(p, "\nphone:\t");
p = istatbuf + strlen(istatbuf); p = istatbuf + strlen(istatbuf);
for (i = 0; i < ISDN_MAX_CHANNELS; i++) { for (i = 0; i < ISDN_MAX_CHANNELS; i++) {
slot = isdn_minor2slot(i); slot = get_slot_by_minor(i);
if (slot) if (slot) {
sprintf(p, "%s ", slot->num); sprintf(p, "%s ", slot->num);
else put_slot(slot);
} else {
sprintf(p, " "); sprintf(p, " ");
}
p = istatbuf + strlen(istatbuf); p = istatbuf + strlen(istatbuf);
} }
sprintf(p, "\n"); sprintf(p, "\n");
...@@ -1396,10 +1396,11 @@ isdn_status_ioctl(struct inode *inode, struct file *file, uint cmd, ulong arg) ...@@ -1396,10 +1396,11 @@ isdn_status_ioctl(struct inode *inode, struct file *file, uint cmd, ulong arg)
sizeof(ulong) * ISDN_MAX_CHANNELS * 2))) sizeof(ulong) * ISDN_MAX_CHANNELS * 2)))
return ret; return ret;
for (i = 0; i < ISDN_MAX_CHANNELS; i++) { for (i = 0; i < ISDN_MAX_CHANNELS; i++) {
slot = isdn_minor2slot(i); slot = get_slot_by_minor(i);
if (slot) { if (slot) {
put_user(slot->ibytes, p++); put_user(slot->ibytes, p++);
put_user(slot->obytes, p++); put_user(slot->obytes, p++);
put_slot(slot);
} else { } else {
put_user(zero_ul, p++); put_user(zero_ul, p++);
put_user(zero_ul, p++); put_user(zero_ul, p++);
...@@ -1436,29 +1437,27 @@ static int ...@@ -1436,29 +1437,27 @@ static int
isdn_ctrl_open(struct inode *ino, struct file *file) isdn_ctrl_open(struct inode *ino, struct file *file)
{ {
unsigned int minor = minor(ino->i_rdev); unsigned int minor = minor(ino->i_rdev);
int drvidx = isdn_minor2drv(minor - ISDN_MINOR_CTRL); struct isdn_slot *slot = get_slot_by_minor(minor - ISDN_MINOR_CTRL);
struct isdn_driver *drv;
drv = get_drv_by_nr(drvidx); if (!slot)
if (!drv)
return -ENODEV; return -ENODEV;
isdn_lock_driver(drv); isdn_lock_driver(slot->drv);
file->private_data = slot;
file->private_data = drv;
return 0; return 0;
} }
static int static int
isdn_ctrl_release(struct inode *ino, struct file *file) isdn_ctrl_release(struct inode *ino, struct file *file)
{ {
struct isdn_driver *drv = file->private_data; struct isdn_slot *slot = file->private_data;
if (dev->profd == current) if (dev->profd == current)
dev->profd = NULL; dev->profd = NULL;
isdn_unlock_driver(drv); isdn_unlock_driver(slot->drv);
put_drv(drv); put_slot(slot);
return 0; return 0;
} }
...@@ -1466,24 +1465,22 @@ isdn_ctrl_release(struct inode *ino, struct file *file) ...@@ -1466,24 +1465,22 @@ isdn_ctrl_release(struct inode *ino, struct file *file)
static ssize_t static ssize_t
isdn_ctrl_read(struct file *file, char *buf, size_t count, loff_t * off) isdn_ctrl_read(struct file *file, char *buf, size_t count, loff_t * off)
{ {
struct isdn_driver *drv = file->private_data; struct isdn_slot *slot = file->private_data;
unsigned int minor = minor(file->f_dentry->d_inode->i_rdev);
DECLARE_WAITQUEUE(wait, current); DECLARE_WAITQUEUE(wait, current);
unsigned long flags; unsigned long flags;
int len = 0; int len = 0;
if (off != &file->f_pos) if (off != &file->f_pos)
return -ESPIPE; return -ESPIPE;
if (!drv->interface->readstat) { if (!slot->drv->interface->readstat) {
isdn_BUG(); isdn_BUG();
return 0; return 0;
} }
add_wait_queue(&drv->st_waitq, &wait); add_wait_queue(&slot->drv->st_waitq, &wait);
for (;;) { for (;;) {
spin_lock_irqsave(&stat_lock, flags); spin_lock_irqsave(&stat_lock, flags);
len = drv->stavail; len = slot->drv->stavail;
spin_unlock_irqrestore(&stat_lock, flags); spin_unlock_irqrestore(&stat_lock, flags);
if (len > 0) if (len > 0)
break; break;
...@@ -1498,7 +1495,7 @@ isdn_ctrl_read(struct file *file, char *buf, size_t count, loff_t * off) ...@@ -1498,7 +1495,7 @@ isdn_ctrl_read(struct file *file, char *buf, size_t count, loff_t * off)
schedule(); schedule();
} }
__set_current_state(TASK_RUNNING); __set_current_state(TASK_RUNNING);
remove_wait_queue(&drv->st_waitq, &wait); remove_wait_queue(&slot->drv->st_waitq, &wait);
if (len < 0) if (len < 0)
return len; return len;
...@@ -1506,15 +1503,15 @@ isdn_ctrl_read(struct file *file, char *buf, size_t count, loff_t * off) ...@@ -1506,15 +1503,15 @@ isdn_ctrl_read(struct file *file, char *buf, size_t count, loff_t * off)
if (count > len) if (count > len)
count = len; count = len;
len = drv->interface->readstat(buf, count, 1, drv->di, len = slot->drv->interface->readstat(buf, count, 1, slot->di,
isdn_minor2chan(minor)); slot->ch);
spin_lock_irqsave(&stat_lock, flags); spin_lock_irqsave(&stat_lock, flags);
if (len) { if (len) {
drv->stavail -= len; slot->drv->stavail -= len;
} else { } else {
isdn_BUG(); isdn_BUG();
drv->stavail = 0; slot->drv->stavail = 0;
} }
spin_unlock_irqrestore(&stat_lock, flags); spin_unlock_irqrestore(&stat_lock, flags);
...@@ -1525,20 +1522,19 @@ isdn_ctrl_read(struct file *file, char *buf, size_t count, loff_t * off) ...@@ -1525,20 +1522,19 @@ isdn_ctrl_read(struct file *file, char *buf, size_t count, loff_t * off)
static ssize_t static ssize_t
isdn_ctrl_write(struct file *file, const char *buf, size_t count, loff_t *off) isdn_ctrl_write(struct file *file, const char *buf, size_t count, loff_t *off)
{ {
struct isdn_driver *drv = file->private_data; struct isdn_slot *slot = file->private_data;
unsigned int minor = minor(file->f_dentry->d_inode->i_rdev);
int retval; int retval;
if (off != &file->f_pos) if (off != &file->f_pos) {
return -ESPIPE; retval = -ESPIPE;
goto out;
if (!drv->interface->writecmd) { }
if (!slot->drv->interface->writecmd) {
retval = -EINVAL; retval = -EINVAL;
goto out; goto out;
} }
retval = drv->interface-> retval = slot->drv->interface->writecmd(buf, count, 1, slot->di,
writecmd(buf, count, 1, drv->di, slot->ch);
isdn_minor2chan(minor - ISDN_MINOR_CTRL));
out: out:
return retval; return retval;
...@@ -1547,12 +1543,12 @@ isdn_ctrl_write(struct file *file, const char *buf, size_t count, loff_t *off) ...@@ -1547,12 +1543,12 @@ isdn_ctrl_write(struct file *file, const char *buf, size_t count, loff_t *off)
static unsigned int static unsigned int
isdn_ctrl_poll(struct file *file, poll_table *wait) isdn_ctrl_poll(struct file *file, poll_table *wait)
{ {
struct isdn_driver *drv = file->private_data; struct isdn_slot *slot = file->private_data;
unsigned int mask = 0; unsigned int mask = 0;
poll_wait(file, &drv->st_waitq, wait); poll_wait(file, &slot->drv->st_waitq, wait);
mask = POLLOUT | POLLWRNORM; mask = POLLOUT | POLLWRNORM;
if (drv->stavail) if (slot->drv->stavail)
mask |= POLLIN | POLLRDNORM; mask |= POLLIN | POLLRDNORM;
return mask; return mask;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7