lets try this again. for now there are two owner pointers, the original
in atmdev_ops and another in the struct shared between the common code
and the lane code. the shared one pointers to the private owner.
would that be the 'right' way or should i just ignore the owner field
in atmdev_ops.
Index: linux/net/atm/lec.h
===================================================================
RCS file: /home/chas/CVSROOT/linux/net/atm/lec.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux/net/atm/lec.h 24 Feb 2003 13:24:46 -0000 1.3
+++ linux/net/atm/lec.h 26 Feb 2003 15:52:44 -0000 1.4
@@ -65,6 +65,7 @@
int (*mcast_attach)(struct atm_vcc *vcc, int arg);
int (*vcc_attach)(struct atm_vcc *vcc, void *arg);
struct net_device **(*get_lecs)(void);
+ struct module *owner;
};
/*
Index: linux/net/atm/proc.c
===================================================================
RCS file: /home/chas/CVSROOT/linux/net/atm/proc.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux/net/atm/proc.c 20 Feb 2003 13:46:30 -0000 1.1
+++ linux/net/atm/proc.c 26 Feb 2003 15:52:44 -0000 1.2
@@ -444,8 +444,11 @@
}
if (atm_lane_ops.get_lecs == NULL)
return 0; /* the lane module is not there yet */
- else
- dev_lec = atm_lane_ops.get_lecs();
+
+ if (!try_module_get(atm_lane_ops.owner))
+ return 0;
+
+ dev_lec = atm_lane_ops.get_lecs();
count = pos;
for(d=0;d<MAX_LEC_ITF;d++) {
@@ -458,6 +461,7 @@
e=sprintf(buf,"%s ",
dev_lec[d]->name);
lec_info(entry,buf+e);
+ module_put(atm_lane_ops.owner);
return strlen(buf);
}
}
@@ -466,6 +470,7 @@
if (--count) continue;
e=sprintf(buf,"%s ",dev_lec[d]->name);
lec_info(entry, buf+e);
+ module_put(atm_lane_ops.owner);
return strlen(buf);
}
for(entry=priv->lec_no_forward; entry;
@@ -473,6 +478,7 @@
if (--count) continue;
e=sprintf(buf,"%s ",dev_lec[d]->name);
lec_info(entry, buf+e);
+ module_put(atm_lane_ops.owner);
return strlen(buf);
}
for(entry=priv->mcast_fwds; entry;
@@ -480,9 +486,11 @@
if (--count) continue;
e=sprintf(buf,"%s ",dev_lec[d]->name);
lec_info(entry, buf+e);
+ module_put(atm_lane_ops.owner);
return strlen(buf);
}
}
+ module_put(atm_lane_ops.owner);
return 0;
}
#endif
Index: linux/net/atm/common.c
===================================================================
RCS file: /home/chas/CVSROOT/linux/net/atm/common.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux/net/atm/common.c 25 Feb 2003 20:06:54 -0000 1.4
+++ linux/net/atm/common.c 26 Feb 2003 15:52:44 -0000 1.5
@@ -685,12 +685,15 @@
}
if (atm_lane_ops.lecd_attach == NULL)
atm_lane_init();
- if (atm_lane_ops.lecd_attach == NULL) { /* try again */
+ if (!try_module_get(atm_lane_ops.owner)) { /* try again */
ret_val = -ENOSYS;
goto done;
}
error = atm_lane_ops.lecd_attach(vcc, (int)arg);
- if (error >= 0) sock->state = SS_CONNECTED;
+ if (error >= 0)
+ sock->state = SS_CONNECTED;
+ else
+ module_put(atm_lane_ops.owner);
ret_val = error;
goto done;
case ATMLEC_MCAST:
Index: linux/net/atm/lec.c
===================================================================
RCS file: /home/chas/CVSROOT/linux/net/atm/lec.c,v
retrieving revision 1.8
retrieving revision 1.10
diff -u -r1.8 -r1.10
--- linux/net/atm/lec.c 25 Feb 2003 11:59:08 -0000 1.8
+++ linux/net/atm/lec.c 26 Feb 2003 15:52:44 -0000 1.10
@@ -543,12 +543,12 @@
}
printk("%s: Shut down!\n", dev->name);
- MOD_DEC_USE_COUNT;
}
static struct atmdev_ops lecdev_ops = {
.close = lec_atm_close,
- .send = lec_atm_send
+ .send = lec_atm_send,
+ .owner = THIS_MODULE
};
static struct atm_dev lecatm_dev = {
@@ -824,7 +824,6 @@
if (dev_lec[i]->flags & IFF_UP) {
netif_start_queue(dev_lec[i]);
}
- MOD_INC_USE_COUNT;
return i;
}
@@ -834,6 +833,7 @@
ops->mcast_attach = lec_mcast_attach;
ops->vcc_attach = lec_vcc_attach;
ops->get_lecs = get_dev_lec;
+ ops->owner = lecdev_ops.owner;
printk("lec.c: " __DATE__ " " __TIME__ " initialized\n");
@@ -859,6 +859,7 @@
atm_lane_ops.mcast_attach = NULL;
atm_lane_ops.vcc_attach = NULL;
atm_lane_ops.get_lecs = NULL;
+ atm_lane_ops.owner = NULL;
for (i = 0; i < MAX_LEC_ITF; i++) {
if (dev_lec[i] != NULL) {
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Fri Feb 28 2003 - 22:00:36 EST