"Fossies" - the Fresh Open Source Software archive

Member "aoe6-83/conf/10-patches/old-new.diff" of archive aoe6-83.tar.gz:

diff -upr old/linux/drivers/block/aoe/aoe.h new/linux/drivers/block/aoe/aoe.h
--- old/linux/drivers/block/aoe/aoe.h	2008-12-23 13:38:10.000000000 -0500
+++ new/linux/drivers/block/aoe/aoe.h	2008-12-23 12:56:05.000000000 -0500
@@ -218,7 +218,7 @@ void aoecmd_work(struct aoedev *d);
 void aoecmd_cfg(ushort aoemajor, unsigned char aoeminor);
 struct sk_buff *aoecmd_ata_rsp(struct sk_buff *);
 void aoecmd_cfg_rsp(struct sk_buff *);
-void aoecmd_sleepwork(void *work);
+void aoecmd_sleepwork(struct work_struct *work);
 void aoecmd_wreset(struct aoetgt *t);
 void aoecmd_cleanslate(struct aoedev *);
 struct sk_buff *aoecmd_ata_id(struct aoedev *);
diff -upr old/linux/drivers/block/aoe/aoecmd.c new/linux/drivers/block/aoe/aoecmd.c
--- old/linux/drivers/block/aoe/aoecmd.c	2008-12-23 13:38:10.000000000 -0500
+++ new/linux/drivers/block/aoe/aoecmd.c	2008-12-23 12:56:05.000000000 -0500
@@ -896,9 +896,9 @@ aoecmd_work(struct aoedev *d)
 /* this function performs work that has been deferred until sleeping is OK.
 */
 void
-aoecmd_sleepwork(void *work)
+aoecmd_sleepwork(struct work_struct *work)
 {
-	struct aoedev *d = (struct aoedev *) work;
+	struct aoedev *d = container_of(work, struct aoedev, work);
 	struct block_device *bd;
 	u64 ssize;
 
diff -upr old/linux/drivers/block/aoe/aoedev.c new/linux/drivers/block/aoe/aoedev.c
--- old/linux/drivers/block/aoe/aoedev.c	2008-12-23 13:39:25.000000000 -0500
+++ new/linux/drivers/block/aoe/aoedev.c	2008-12-23 12:56:05.000000000 -0500
@@ -468,7 +468,7 @@ aoedev_by_aoeaddr(ulong maj, int min, in
 		goto out;
 	}
 	d->ntargets = NTARGETS;
-	INIT_WORK(&d->work, aoecmd_sleepwork, d);
+	INIT_WORK(&d->work, aoecmd_sleepwork);
 	spin_lock_init(&d->lock);
 	init_timer(&d->timer);
 	d->timer.data = (ulong) d;