From: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
To: Linus Torvalds <torvalds@transmeta.com>
Cc: axboe@suse.de, linux-kernel@vger.kernel.org, davej@suse.de
Subject: Re: [PATCH] scsi uodate to remove io_request_lock
Date: Tue, 29 Jan 2002 05:29:39 +0300 [thread overview]
Message-ID: <20020129052939.2648bc14.johnpol@2ka.mipt.ru> (raw)
In-Reply-To: <Pine.LNX.4.33.0201281745350.10600-100000@penguin.transmeta.com>
In-Reply-To: <20020129043528.47f020a7.johnpol@2ka.mipt.ru> <Pine.LNX.4.33.0201281745350.10600-100000@penguin.transmeta.com>
[-- Attachment #1: Type: text/plain, Size: 256 bytes --]
On Mon, 28 Jan 2002 17:46:49 -0800 (PST)
Linus Torvalds <torvalds@transmeta.com> wrote:
> Can you re-do the diff against your previous diff, I've already applied
> it to my tree..
It was simple cleanup.
Thanks.
> Linus
Evgeniy Polyakov ( s0mbre ).
[-- Attachment #2: diff_against_diff.diff --]
[-- Type: application/octet-stream, Size: 4278 bytes --]
--- /Linux/my_code/my_kernel_patches/__scsi.diff Tue Jan 29 05:14:39 2002
+++ /Linux/my_code/my_kernel_patches/scsi.diff Tue Jan 29 05:09:06 2002
@@ -1,5 +1,3 @@
-Only in ./drivers/scsi/: .depend
-Only in ./drivers/scsi/: .hosts.c.swp
diff -ur ./drivers/scsi/3w-xxxx.c ./drivers/scsi/3w-xxxx.c
--- ./drivers/scsi/3w-xxxx.c Mon Jan 28 13:45:33 2002
+++ ./drivers/scsi/3w-xxxx.c Mon Jan 28 13:47:33 2002
@@ -55,7 +53,6 @@
spin_lock(&tw_dev->tw_lock);
tw_dev->num_resets++;
-Only in ./drivers/scsi/: 3w-xxxx.c~
diff -ur ./drivers/scsi/53c7,8xx.c ./drivers/scsi/53c7,8xx.c
--- ./drivers/scsi/53c7,8xx.c Mon Jan 28 13:45:33 2002
+++ ./drivers/scsi/53c7,8xx.c Mon Jan 28 13:28:17 2002
@@ -477,7 +474,6 @@
}
int aha1740_queuecommand(Scsi_Cmnd * SCpnt, void (*done)(Scsi_Cmnd *))
-Only in ./drivers/scsi/aic7xxx: .depend
diff -ur ./drivers/scsi/atp870u.c ./drivers/scsi/atp870u.c
--- ./drivers/scsi/atp870u.c Mon Jan 28 13:45:33 2002
+++ ./drivers/scsi/atp870u.c Mon Jan 28 13:36:46 2002
@@ -1035,10 +1031,10 @@
-#define GDTH_UNLOCK_SCSI_DONE(flags) spin_unlock_irqrestore(&io_request_lock,flags)
-#define GDTH_LOCK_SCSI_DOCMD() spin_lock_irq(&io_request_lock)
-#define GDTH_UNLOCK_SCSI_DOCMD() spin_unlock_irq(&io_request_lock)
-+#define GDTH_LOCK_SCSI_DONE(dev, flags) spin_lock_irqsave(((struct Scsi_Host *)dev->host_lock),flags)
-+#define GDTH_UNLOCK_SCSI_DONE(flags) spin_unlock_irqrestore(((struct Scsi_Host *)dev->host_lock),flags)
-+#define GDTH_LOCK_SCSI_DOCMD(dev) spin_lock_irq(((struct Scsi_Host *)dev->host_lock))
-+#define GDTH_UNLOCK_SCSI_DOCMD(dev) spin_unlock_irq(((struct Scsi_Host *)dev->host_lock))
++#define GDTH_LOCK_SCSI_DONE(dev, flags) spin_lock_irqsave(dev->host_lock,flags)
++#define GDTH_UNLOCK_SCSI_DONE(flags) spin_unlock_irqrestore(dev->host_lock,flags)
++#define GDTH_LOCK_SCSI_DOCMD(dev) spin_lock_irq(dev->host_lock)
++#define GDTH_UNLOCK_SCSI_DOCMD(dev) spin_unlock_irq(dev->host_lock)
#else
#define GDTH_INIT_LOCK_HA(ha) do {} while (0)
#define GDTH_LOCK_HA(ha,flags) do {save_flags(flags); cli();} while (0)
@@ -1091,8 +1087,8 @@
-#define IBMLOCK spin_lock_irqsave(&io_request_lock, flags);
-#define IBMUNLOCK spin_unlock_irqrestore(&io_request_lock, flags);
-+#define IBMLOCK(dev) spin_lock_irqsave(((struct Scsi_Host *)dev)->host_lock, flags);
-+#define IBMUNLOCK(dev) spin_unlock_irqrestore(((struct Scsi_Host *)dev)->host_lock, flags);
++#define IBMLOCK(dev) spin_lock_irqsave(dev->host_lock, flags);
++#define IBMUNLOCK(dev) spin_unlock_irqrestore(dev->host_lock, flags);
/* driver configuration */
#define IM_MAX_HOSTS 8 /* maximum number of host adapters */
@@ -1783,10 +1779,10 @@
-#define IO_UNLOCK(host) spin_unlock_irqrestore(&(host)->host_lock,io_flags)
-#define IO_LOCK_IRQ(host) spin_lock_irq(&(host)->host_lock)
-#define IO_UNLOCK_IRQ(host) spin_unlock_irq(&(host)->host_lock)
-+#define IO_LOCK(host) spin_lock_irqsave((host)->host_lock,io_flags)
-+#define IO_UNLOCK(host) spin_unlock_irqrestore((host)->host_lock,io_flags)
-+#define IO_LOCK_IRQ(host) spin_lock_irq((host)->host_lock)
-+#define IO_UNLOCK_IRQ(host) spin_unlock_irq((host)->host_lock)
++#define IO_LOCK(host) spin_lock_irqsave(host->host_lock,io_flags)
++#define IO_UNLOCK(host) spin_unlock_irqrestore(host->host_lock,io_flags)
++#define IO_LOCK_IRQ(host) spin_lock_irq(host->host_lock)
++#define IO_UNLOCK_IRQ(host) spin_unlock_irq(host->host_lock)
#define queue_task_irq(a,b) queue_task(a,b)
#define queue_task_irq_off(a,b) queue_task(a,b)
@@ -1931,7 +1927,6 @@
out:;
}
/****************************************************************
-Only in ./drivers/scsi/pcmcia: .depend
diff -ur ./drivers/scsi/ppa.c ./drivers/scsi/ppa.c
--- ./drivers/scsi/ppa.c Mon Jan 28 13:45:34 2002
+++ ./drivers/scsi/ppa.c Mon Jan 28 13:29:22 2002
@@ -2252,7 +2247,6 @@
{
restore_flags(flags);
printk(KERN_ERR "sym53c416: Unable to assign IRQ %d\n", hosts[i].irq);
-Only in ./drivers/scsi/sym53c8xx_2: .depend
diff -ur ./drivers/scsi/sym53c8xx_comm.h ./drivers/scsi/sym53c8xx_comm.h
--- ./drivers/scsi/sym53c8xx_comm.h Mon Jan 28 13:45:34 2002
+++ ./drivers/scsi/sym53c8xx_comm.h Mon Jan 28 13:41:44 2002
[-- Attachment #3: against_tree_with_previous_patch_applied.diff --]
[-- Type: application/octet-stream, Size: 2827 bytes --]
diff -ur ./drivers/scsi/gdth.c ./drivers/scsi/gdth.c
--- ./drivers/scsi/gdth.c Tue Jan 29 05:27:02 2002
+++ ./drivers/scsi/gdth.c Tue Jan 29 05:27:33 2002
@@ -629,10 +629,10 @@
#define GDTH_LOCK_HA(ha,flags) spin_lock_irqsave(&(ha)->smp_lock,flags)
#define GDTH_UNLOCK_HA(ha,flags) spin_unlock_irqrestore(&(ha)->smp_lock,flags)
-#define GDTH_LOCK_SCSI_DONE(dev, flags) spin_lock_irqsave(((struct Scsi_Host *)dev->host_lock),flags)
-#define GDTH_UNLOCK_SCSI_DONE(flags) spin_unlock_irqrestore(((struct Scsi_Host *)dev->host_lock),flags)
-#define GDTH_LOCK_SCSI_DOCMD(dev) spin_lock_irq(((struct Scsi_Host *)dev->host_lock))
-#define GDTH_UNLOCK_SCSI_DOCMD(dev) spin_unlock_irq(((struct Scsi_Host *)dev->host_lock))
+#define GDTH_LOCK_SCSI_DONE(dev, flags) spin_lock_irqsave(dev->host_lock,flags)
+#define GDTH_UNLOCK_SCSI_DONE(flags) spin_unlock_irqrestore(dev->host_lock,flags)
+#define GDTH_LOCK_SCSI_DOCMD(dev) spin_lock_irq(dev->host_lock)
+#define GDTH_UNLOCK_SCSI_DOCMD(dev) spin_unlock_irq(dev->host_lock)
#else
#define GDTH_INIT_LOCK_HA(ha) do {} while (0)
#define GDTH_LOCK_HA(ha,flags) do {save_flags(flags); cli();} while (0)
diff -ur ./drivers/scsi/ibmmca.c ./drivers/scsi/ibmmca.c
--- ./drivers/scsi/ibmmca.c Tue Jan 29 05:27:02 2002
+++ ./drivers/scsi/ibmmca.c Tue Jan 29 05:27:33 2002
@@ -41,8 +41,8 @@
/* current version of this driver-source: */
#define IBMMCA_SCSI_DRIVER_VERSION "4.0b"
-#define IBMLOCK(dev) spin_lock_irqsave(((struct Scsi_Host *)dev)->host_lock, flags);
-#define IBMUNLOCK(dev) spin_unlock_irqrestore(((struct Scsi_Host *)dev)->host_lock, flags);
+#define IBMLOCK(dev) spin_lock_irqsave(dev->host_lock, flags);
+#define IBMUNLOCK(dev) spin_unlock_irqrestore(dev->host_lock, flags);
/* driver configuration */
#define IM_MAX_HOSTS 8 /* maximum number of host adapters */
diff -ur ./drivers/scsi/megaraid.c ./drivers/scsi/megaraid.c
--- ./drivers/scsi/megaraid.c Tue Jan 29 05:27:02 2002
+++ ./drivers/scsi/megaraid.c Tue Jan 29 05:27:33 2002
@@ -586,10 +586,10 @@
#define DRIVER_LOCK(p)
#define DRIVER_UNLOCK(p)
#define IO_LOCK_T unsigned long io_flags = 0
-#define IO_LOCK(host) spin_lock_irqsave((host)->host_lock,io_flags)
-#define IO_UNLOCK(host) spin_unlock_irqrestore((host)->host_lock,io_flags)
-#define IO_LOCK_IRQ(host) spin_lock_irq((host)->host_lock)
-#define IO_UNLOCK_IRQ(host) spin_unlock_irq((host)->host_lock)
+#define IO_LOCK(host) spin_lock_irqsave(host->host_lock,io_flags)
+#define IO_UNLOCK(host) spin_unlock_irqrestore(host->host_lock,io_flags)
+#define IO_LOCK_IRQ(host) spin_lock_irq(host->host_lock)
+#define IO_UNLOCK_IRQ(host) spin_unlock_irq(host->host_lock)
#define queue_task_irq(a,b) queue_task(a,b)
#define queue_task_irq_off(a,b) queue_task(a,b)
next prev parent reply other threads:[~2002-01-29 2:30 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20020129043528.47f020a7.johnpol@2ka.mipt.ru>
2002-01-29 1:46 ` Linus Torvalds
2002-01-29 2:29 ` Evgeniy Polyakov [this message]
2002-01-28 4:33 Evgeniy Polyakov
2002-01-28 9:08 ` Jens Axboe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20020129052939.2648bc14.johnpol@2ka.mipt.ru \
--to=johnpol@2ka.mipt.ru \
--cc=axboe@suse.de \
--cc=davej@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@transmeta.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®