work_struct-induced breakage, part 1 of fsck-knows-how-many
Subsystems (10)
---
drivers/char/istallion.c +4 -4
@@ -663,7 +663,7 @@ static int stli_initopen(stlibrd_t *brdpstatic int stli_rawopen (stlibrd_t *brdp,stliport_t *portp,unsigned long arg,int wait);static int stli_rawclose (stlibrd_t *brdp,stliport_t *portp,unsigned long arg,int wait);static int stli_waitcarrier (stlibrd_t *brdp,stliport_t *portp,struct file *filp); -static void stli_dohangup (void *arg); +static void stli_dohangup (struct work_struct *);static int stli_setport (stliport_t *portp);static int stli_cmdwait (stlibrd_t *brdp,stliport_t *portp,unsigned long cmd,void *arg,int size,int copyback);static void stli_sendcmd (stlibrd_t *brdp,stliport_t *portp,unsigned long cmd,void *arg,int size,int copyback);
@@ -1990,9 +1990,9 @@ static void stli_start(struct tty_struct* aren't that time critical). */ -static void stli_dohangup (void *arg) +static void stli_dohangup (struct work_struct *ugly_api) { -stliport_t *portp = (stliport_t *) arg; +stliport_t *portp =container_of (ugly_api, stliport_t, tqhangup);if (portp->tty !=NULL ) {tty_hangup (portp->tty); }
@@ -2898,7 +2898,7 @@ static int stli_initports(stlibrd_t *brd portp->baud_base =STL_BAUDBASE ; portp->close_delay =STL_CLOSEDELAY ; portp->closing_wait =30 *HZ ; -INIT_WORK (&portp->tqhangup, stli_dohangup, portp); +INIT_WORK (&portp->tqhangup, stli_dohangup);init_waitqueue_head (&portp->open_wait);init_waitqueue_head (&portp->close_wait);init_waitqueue_head (&portp->raw_wait);
drivers/char/riscom8.c +6 -6
@@ -1516,9 +1516,9 @@ static void rc_start(struct tty_struct ** do_rc_hangup() -> tty->hangup() -> rc_hangup() * */ -static void do_rc_hangup (void *private_) +static void do_rc_hangup (struct work_struct *ugly_api) { -struct riscom_port *port = (struct riscom_port *) private_; + struct riscom_port *port = container_of(ugly_api, struct riscom_port, tqueue_hangup);struct tty_struct *tty; tty = port->tty;
@@ -1567,9 +1567,9 @@ static void rc_set_termios(struct tty_st } } -static void do_softint (void *private_) +static void do_softint (struct work_struct *ugly_api) { -struct riscom_port *port = (struct riscom_port *) private_; + struct riscom_port *port = container_of(ugly_api, struct riscom_port, tqueue);struct tty_struct *tty;if (!(tty = port->tty))
@@ -1632,8 +1632,8 @@ static inline int rc_init_drivers(void)memset (rc_port,0 ,sizeof (rc_port));for (i =0 ; i <RC_NPORT *RC_NBOARD ; i++) { rc_port[i].magic =RISCOM8_MAGIC ; -INIT_WORK (&rc_port[i].tqueue, do_softint, &rc_port[i]); -INIT_WORK (&rc_port[i].tqueue_hangup, do_rc_hangup, &rc_port[i]); +INIT_WORK (&rc_port[i].tqueue, do_softint); +INIT_WORK (&rc_port[i].tqueue_hangup, do_rc_hangup); rc_port[i].close_delay =50 *HZ /100 ; rc_port[i].closing_wait =3000 *HZ /100 ;init_waitqueue_head (&rc_port[i].open_wait);
drivers/char/serial167.c +3 -3
@@ -706,9 +706,9 @@ #endif* had to poll every port to see if that port needed servicing. */ static void -do_softint (void *private_) +do_softint (struct work_struct *ugly_api) { -struct cyclades_port *info = (struct cyclades_port *) private_; + struct cyclades_port *info = container_of(ugly_api, struct cyclades_port, tqueue);struct tty_struct *tty; tty = info->tty;
@@ -2273,7 +2273,7 @@ #endif info->blocked_open =0 ; info->default_threshold =0 ; info->default_timeout =0 ; -INIT_WORK (&info->tqueue, do_softint, info); +INIT_WORK (&info->tqueue, do_softint);init_waitqueue_head (&info->open_wait);init_waitqueue_head (&info->close_wait);/* info->session */
drivers/char/stallion.c +4 -6
@@ -500,7 +500,7 @@ static int stl_echatintr(stlbrd_t *brdp)static int stl_echmcaintr (stlbrd_t *brdp);static int stl_echpciintr (stlbrd_t *brdp);static int stl_echpci64intr (stlbrd_t *brdp); -static void stl_offintr (void *private); +static void stl_offintr (struct work_struct *);static stlbrd_t *stl_allocbrd (void );static stlport_t *stl_getport (int brdnr,int panelnr,int portnr);
@@ -2081,14 +2081,12 @@ static int stl_echpci64intr(stlbrd_t *br/* * Service an off-level request for some channel. */ -static void stl_offintr (void *private) +static void stl_offintr (struct work_struct *work) { -stlport_t *portp; +stlport_t *portp =container_of (work, stlport_t, tqueue);struct tty_struct *tty;unsigned int oldsigs; - portp = private; -#ifdef DEBUG printk ("stl_offintr(portp=%x)\n" , (int ) portp);#endif
@@ -2156,7 +2154,7 @@ #endif portp->baud_base =STL_BAUDBASE ; portp->close_delay =STL_CLOSEDELAY ; portp->closing_wait =30 *HZ ; -INIT_WORK (&portp->tqueue, stl_offintr, portp); +INIT_WORK (&portp->tqueue, stl_offintr);init_waitqueue_head (&portp->open_wait);init_waitqueue_head (&portp->close_wait); portp->stats.brd = portp->brdnr;
drivers/isdn/hysdn/boardergo.c +3 -2
@@ -71,8 +71,9 @@ ergo_interrupt(int intno, void *dev_id)/* may be queued from everywhere (interrupts included). */ /******************************************************************************/ static void -ergo_irq_bh (hysdn_card * card) +ergo_irq_bh (struct work_struct *ugli_api) { +hysdn_card * card =container_of (ugli_api, hysdn_card, irq_queue);tErgDpram *dpr;int again;unsigned long flags;
@@ -442,7 +443,7 @@ ergo_inithardware(hysdn_card * card) card->writebootseq = ergo_writebootseq; card->waitpofready = ergo_waitpofready; card->set_errlog_state = ergo_set_errlog_state; -INIT_WORK (&card->irq_queue, (void *) (void *) ergo_irq_bh, card); +INIT_WORK (&card->irq_queue, ergo_irq_bh); card->hysdn_lock =SPIN_LOCK_UNLOCKED ;return (0 );
drivers/macintosh/adb.c +2 -2
@@ -267,12 +267,12 @@ adb_probe_task(void *x) }static void -__adb_probe_task (void *data) +__adb_probe_task (struct work_struct *bullshit) { adb_probe_task_pid =kernel_thread (adb_probe_task,NULL ,SIGCHLD |CLONE_KERNEL ); } -static DECLARE_WORK(adb_reset_work, __adb_probe_task, NULL); +static DECLARE_WORK(adb_reset_work, __adb_probe_task);int adb_reset_bus (void )
more work_struct-induced breakage
---
drivers/net/hamradio/dmascc.c +4 -4
@@ -252,7 +252,7 @@ static inline void z8530_isr(struct scc_static irqreturn_t scc_isr (int irq,void *dev_id);static void rx_isr (struct scc_priv *priv);static void special_condition (struct scc_priv *priv,int rc); -static void rx_bh (void *arg); +static void rx_bh (struct work_struct *);static void tx_isr (struct scc_priv *priv);static void es_isr (struct scc_priv *priv);static void tm_isr (struct scc_priv *priv);
@@ -579,7 +579,7 @@ static int __init setup_adapter(int card priv->param.clocks = TCTRxCP | RCRTxCP; priv->param.persist =256 ; priv->param.dma =-1 ; -INIT_WORK (&priv->rx_work, rx_bh, priv); +INIT_WORK (&priv->rx_work, rx_bh); dev->priv = priv;sprintf (dev->name,"dmascc%i" ,2 * n + i); dev->base_addr = card_base;
@@ -1272,9 +1272,9 @@ static void special_condition(struct scc } -static void rx_bh (void *arg) +static void rx_bh (struct work_struct *ugli_api) { -struct scc_priv *priv = arg; + struct scc_priv *priv = container_of(ugli_api, struct scc_priv, rx_work);int i = priv->rx_tail;int cb;unsigned long flags;
and more of the same...
---
drivers/s390/block/dasd.c +4 -6
@@ -54,7 +54,7 @@ static void dasd_flush_request_queue(strstatic void dasd_int_handler (struct ccw_device *,unsigned long ,struct irb *);static int dasd_flush_ccw_queue (struct dasd_device *,int );static void dasd_tasklet (struct dasd_device *); -static void do_kick_device (void *data); +static void do_kick_device (struct work_struct *);/* * SECTION: Operations on the device structure.
@@ -100,7 +100,7 @@ dasd_alloc_device(void) (unsigned long) device);INIT_LIST_HEAD (&device->ccw_queue);init_timer (&device->timer); -INIT_WORK (&device->kick_work, do_kick_device, device); +INIT_WORK (&device->kick_work, do_kick_device); device->state =DASD_STATE_NEW ; device->target =DASD_STATE_NEW ;
@@ -407,11 +407,9 @@ dasd_change_state(struct dasd_device *de* event daemon. */ static void -do_kick_device (void *data) +do_kick_device (struct work_struct *work) { -struct dasd_device *device; - - device = (struct dasd_device *) data; + struct dasd_device *device = container_of(work, struct dasd_device, kick_work);dasd_change_state (device);dasd_schedule_bh (device);dasd_put_device (device);
drivers/s390/cio/css.c +4 -5
@@ -334,7 +334,7 @@ static LIST_HEAD(slow_subchannels_head);static DEFINE_SPINLOCK (slow_subchannel_lock);static void -css_trigger_slow_path (void ) +css_trigger_slow_path (struct work_struct *unused) {CIO_TRACE_EVENT (4 ,"slowpath" );
@@ -359,8 +359,7 @@ css_trigger_slow_path(void)spin_unlock_irq (&slow_subchannel_lock); } -typedef void (*workfunc )(void *); -DECLARE_WORK (slow_path_work, (workfunc )css_trigger_slow_path,NULL ); +DECLARE_WORK (slow_path_work, css_trigger_slow_path);struct workqueue_struct *slow_path_wq;/* Reprobe subchannel if unregistered. */
@@ -397,7 +396,7 @@ static int reprobe_subchannel(struct sub }/* Work function used to reprobe all unregistered subchannels. */ -static void reprobe_all (void *data) +static void reprobe_all (struct work_struct *unused) {int ret;
@@ -413,7 +412,7 @@ static void reprobe_all(void *data) need_reprobe); } -DECLARE_WORK (css_reprobe_work, reprobe_all,NULL ); +DECLARE_WORK (css_reprobe_work, reprobe_all);/* Schedule reprobing of all unregistered subchannels. */ void css_schedule_reprobe (void )
drivers/s390/crypto/ap_bus.c +3 -3
@@ -37,7 +37,7 @@ #include <asm/s390_rdev.h>#include "ap_bus.h" /* Some prototypes. */ -static void ap_scan_bus (void *); +static void ap_scan_bus (struct work_struct *);static void ap_poll_all (unsigned long );static void ap_poll_timeout (unsigned long );static int ap_poll_thread_start (void );
@@ -71,7 +71,7 @@ static struct device *ap_root_device = Nstatic struct workqueue_struct *ap_work_queue;static struct timer_list ap_config_timer;static int ap_config_time =AP_CONFIG_TIME ; -static DECLARE_WORK(ap_config_work, ap_scan_bus, NULL); +static DECLARE_WORK(ap_config_work, ap_scan_bus);/** * Tasklet & timer for AP request polling.
@@ -732,7 +732,7 @@ static void ap_device_release(struct devkfree (ap_dev); } -static void ap_scan_bus (void *data) +static void ap_scan_bus (struct work_struct *unused) {struct ap_device *ap_dev;struct device *dev;
drivers/s390/net/lcs.c +4 -4
@@ -67,7 +67,7 @@ static char debug_buffer[255];* Some prototypes. */ static void lcs_tasklet (unsigned long ); -static void lcs_start_kernel_thread (struct lcs_card *card); +static void lcs_start_kernel_thread (struct work_struct *);static void lcs_get_frames_cb (struct lcs_channel *,struct lcs_buffer *);static int lcs_send_delipm (struct lcs_card *,struct lcs_ipm_list *);static int lcs_recovery (void *ptr);
@@ -1724,8 +1724,9 @@ lcs_stopcard(struct lcs_card *card)* Kernel Thread helper functions for LGW initiated commands */ static void -lcs_start_kernel_thread (struct lcs_card *card) +lcs_start_kernel_thread (struct work_struct *work) { + struct lcs_card *card = container_of(work, struct lcs_card, kernel_thread_starter);LCS_DBF_TEXT (5 , trace,"krnthrd" );if (lcs_do_start_thread (card,LCS_RECOVERY_THREAD ))kernel_thread (lcs_recovery, (void *) card,SIGCHLD );
@@ -2053,8 +2054,7 @@ lcs_probe_device(struct ccwgroup_device ccwgdev->cdev[0 ]->handler = lcs_irq; ccwgdev->cdev[1 ]->handler = lcs_irq; card->gdev = ccwgdev; -INIT_WORK (&card->kernel_thread_starter, - (void *) lcs_start_kernel_thread, card); +INIT_WORK (&card->kernel_thread_starter, lcs_start_kernel_thread); card->thread_start_mask =0 ; card->thread_allowed_mask =0 ; card->thread_running_mask =0 ;
drivers/s390/net/qeth_main.c +3 -3
@@ -1039,8 +1039,9 @@ qeth_do_start_thread(struct qeth_card *c }static void -qeth_start_kernel_thread (struct qeth_card *card) +qeth_start_kernel_thread (struct work_struct *work) { + struct qeth_card *card = container_of(work, struct qeth_card, kernel_thread_starter);QETH_DBF_TEXT (trace ,2 ,"strthrd" ); if (card->read.state != CH_STATE_UP &&
@@ -1103,8 +1104,7 @@ #endif card->thread_start_mask =0 ; card->thread_allowed_mask =0 ; card->thread_running_mask =0 ; -INIT_WORK (&card->kernel_thread_starter, - (void *)qeth_start_kernel_thread,card); +INIT_WORK (&card->kernel_thread_starter, qeth_start_kernel_thread);INIT_LIST_HEAD (&card->ip_list); card->ip_tbd_list =kmalloc (sizeof (struct list_head ),GFP_KERNEL );if (!card->ip_tbd_list) {
drivers/scsi/oktagon_esp.c +3 -3
@@ -72,12 +72,12 @@ static void dma_advance_sg(Scsi_Cmnd *);static int oktagon_notify_reboot (struct notifier_block *this,unsigned long code,void *x);#ifdef USE_BOTTOM_HALF -static void dma_commit (void *opaque); +static void dma_commit (struct work_struct *unused);long oktag_to_io (long *paddr,long *addr,long len);long oktag_from_io (long *addr,long *paddr,long len); -static DECLARE_WORK(tq_fake_dma, dma_commit, NULL); +static DECLARE_WORK(tq_fake_dma, dma_commit);#define DMA_MAXTRANSFER 0x8000
@@ -266,7 +266,7 @@ #ifdef USE_BOTTOM_HALF*/ -static void dma_commit (void *opaque) +static void dma_commit (struct work_struct *unused) {long wait,len2,pos;struct NCR_ESP *esp;
... and more...
---
drivers/i2c/chips/m41t00.c +8 -1
@@ -215,8 +215,15 @@ m41t00_set(void *arg) }static ulong new_time; +/* well, isn't this API just _lovely_? */ +static void +m41t00_barf (struct work_struct *unusable) +{ +m41t00_set (&new_time); +} +static struct workqueue_struct *m41t00_wq; -static DECLARE_WORK(m41t00_work, m41t00_set, &new_time); +static DECLARE_WORK(m41t00_work, m41t00_barf);int m41t00_set_rtc_time (ulong nowtime)
drivers/net/mv643xx_eth.c +6 -4
@@ -277,9 +277,12 @@ static void mv643xx_eth_tx_timeout(struc* * Actual routine to reset the adapter when a timeout on Tx has occurred */ -static void mv643xx_eth_tx_timeout_task (struct net_device *dev) +static void mv643xx_eth_tx_timeout_task (struct work_struct *ugly) { -struct mv643xx_private *mp =netdev_priv (dev); + struct mv643xx_private *mp = container_of(ugly, struct mv643xx_private, + tx_timeout_task); +struct net_device *dev = mp->mii.dev;/* yuck */ +netdev_priv (dev);if (!netif_running (dev))return ;
@@ -1360,8 +1363,7 @@ #endif#endif /* Configure the timeout task */ -INIT_WORK (&mp->tx_timeout_task, - (void (*)(void *))mv643xx_eth_tx_timeout_task, dev); +INIT_WORK (&mp->tx_timeout_task, mv643xx_eth_tx_timeout_task);spin_lock_init (&mp->lock);
Re: ... and more...
On Wed, Dec 06, 2006 at 07:46:41PM +0000, Al Viro wrote:
Gah... Harmless but stupid: leftover netdev_priv(dev);
drivers/i2c/chips/m41t00.c +8 -1
@@ -215,8 +215,15 @@ m41t00_set(void *arg) }static ulong new_time; +/* well, isn't this API just _lovely_? */ +static void +m41t00_barf (struct work_struct *unusable) +{ +m41t00_set (&new_time); +} +static struct workqueue_struct *m41t00_wq; -static DECLARE_WORK(m41t00_work, m41t00_set, &new_time); +static DECLARE_WORK(m41t00_work, m41t00_barf);int m41t00_set_rtc_time (ulong nowtime)
drivers/net/mv643xx_eth.c +5 -4
@@ -277,9 +277,11 @@ static void mv643xx_eth_tx_timeout(struc* * Actual routine to reset the adapter when a timeout on Tx has occurred */ -static void mv643xx_eth_tx_timeout_task (struct net_device *dev) +static void mv643xx_eth_tx_timeout_task (struct work_struct *ugly) { -struct mv643xx_private *mp =netdev_priv (dev); + struct mv643xx_private *mp = container_of(ugly, struct mv643xx_private, + tx_timeout_task); +struct net_device *dev = mp->mii.dev;/* yuck */ if (!netif_running (dev))return ;
@@ -1360,8 +1362,7 @@ #endif#endif /* Configure the timeout task */ -INIT_WORK (&mp->tx_timeout_task, - (void (*)(void *))mv643xx_eth_tx_timeout_task, dev); +INIT_WORK (&mp->tx_timeout_task, mv643xx_eth_tx_timeout_task);spin_lock_init (&mp->lock);
... and then some...
In reply to Al Viro---
drivers/scsi/ibmvscsi/ibmvstgt.c +6 -4
@@ -67,6 +67,7 @@ struct vio_port {unsigned long liobn;unsigned long riobn; +struct srp_target *target; };static struct workqueue_struct *vtgtd;
@@ -685,10 +686,10 @@ static inline struct viosrp_crq *next_crreturn crq; } -static void handle_crq (void *data) +static void handle_crq (struct work_struct *work) { -struct srp_target *target = (struct srp_target *) data; -struct vio_port *vport =target_to_port (target); + struct vio_port *vport = container_of(work, struct vio_port, crq_work); +struct srp_target *target = vport->target;struct viosrp_crq *crq;int done =0 ;
@@ -822,6 +823,7 @@ static int ibmvstgt_probe(struct vio_dev target->shost = shost; vport->dma_dev = dev; target->ldata = vport; + vport->target = target; err =srp_target_alloc (target, &dev->dev,INITIAL_SRP_LIMIT ,SRP_MAX_IU_LEN );if (err)
@@ -837,7 +839,7 @@ static int ibmvstgt_probe(struct vio_dev vport->liobn = dma[0 ]; vport->riobn = dma[5 ]; -INIT_WORK (&vport->crq_work, handle_crq, target); +INIT_WORK (&vport->crq_work, handle_crq); err =crq_queue_create (&vport->crq_queue, target);if (err)
Re: ... and more...
In reply to Al Virodrivers/i2c/chips/m41t00.c
Quoted 1 line · Al Viro
drivers/i2c/chips/m41t00.c +0
-0
This could be done differently. m41t00_set() is only called on that global variable, so why pass its address in as an argument?
The old code is also wrong: m41t00_set() was being passed a pointer to an unsigned long, but then was casting it to a pointer to an int before dereferencing it. This works on a 32-bit platform, but it's just asking for trouble on a 64-bit big-endian platform. However, the driver can only be configured when CONFIG_PPC32=y, so it will have gone unnoticed.
David
---
Fix m41t00_set() and its usage with workqueues
From: David Howells <[email protected]>
Fix m41t00_set() and its usage with workqueues. It doesn't really need an argument since it always affects the same global variable.
---
drivers/i2c/chips/m41t00.c | 18 ++++++------------ 1 files changed, 6 insertions(+), 12 deletions(-)
drivers/i2c/chips/m41t00.c +6 -12
@@ -165,11 +165,13 @@ read_err: }EXPORT_SYMBOL_GPL (m41t00_get_rtc_time); +static ulong new_time; +static void -m41t00_set (void *arg) +m41t00_set (struct work_struct *unused) {struct rtc_time tm; -int nowtime = *(int *)arg; +int nowtime = new_time;s32 sec, min, hour, day, mon, year;u8 wbuf[9 ], *buf = &wbuf[1 ], msgbuf[1 ] = {0 };struct i2c_msg msgs[] = {
@@ -214,16 +216,8 @@ m41t00_set(void *arg)dev_err (&save_client->dev,"m41t00_set: Write error\n" ); } -static ulong new_time; -/* well, isn't this API just _lovely_? */ -static void -m41t00_barf (struct work_struct *unusable) -{ -m41t00_set (&new_time); -} -static struct workqueue_struct *m41t00_wq; -static DECLARE_WORK(m41t00_work, m41t00_barf); +static DECLARE_WORK(m41t00_work, m41t00_set);int m41t00_set_rtc_time (ulong nowtime)
@@ -233,7 +227,7 @@ m41t00_set_rtc_time(ulong nowtime)if (in_interrupt ())queue_work (m41t00_wq, &m41t00_work);else -m41t00_set (&new_time); +m41t00_set (NULL );return 0 ; }