From: Alan Stern <[email protected]
Add synchronization for USB and SCSI block devices.
Signed-off-by: Alan Stern <[email protected]
Signed-off-by: David VomLehn <[email protected]>
---
drivers/scsi/scsi_scan.c | 2 ++
drivers/usb/storage/usb.c | 2 ++
2 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index 6f51ca4..735b061 100644
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -1834,6 +1834,7 @@ static int do_scan_async(void *_data)
struct async_scan_data *data = _data;
do_scsi_scan_host(data->shost);
scsi_finish_async_scan(data);
+ bootdev_probe_done(BOOTDEV_BLOCK_MASK);
return 0;
}
@@ -1855,6 +1856,7 @@ void scsi_scan_host(struct Scsi_Host *shost)
return;
}
+ bootdev_found(BOOTDEV_BLOCK_MASK);
p = kthread_run(do_scan_async, data, "scsi_scan_%d", shost->host_no);
if (IS_ERR(p))
do_scan_async(data);
diff --git a/drivers/usb/storage/usb.c b/drivers/usb/storage/usb.c
index 8060b85..c128c44 100644
--- a/drivers/usb/storage/usb.c
+++ b/drivers/usb/storage/usb.c
@@ -810,6 +810,7 @@ static int usb_stor_scan_thread(void * __us)
printk(KERN_DEBUG
"usb-storage: device found at %d\n", us->pusb_dev->devnum);
+ bootdev_found(BOOTDEV_BLOCK_MASK);
set_freezable();
/* Wait for the timeout to expire or for a disconnect */
@@ -837,6 +838,7 @@ static int usb_stor_scan_thread(void * __us)
/* Should we unbind if no devices were detected? */
}
+ bootdev_probe_done(BOOTDEV_BLOCK_MASK);
complete_and_exit(&us->scanning_done, 0);
}
On Wed, Apr 29, 2009 at 05:12:55PM -0700, David VomLehn wrote:
> scsi_finish_async_scan(data);
> + bootdev_probe_done(BOOTDEV_BLOCK_MASK);
> return 0;
> }
>
> @@ -1855,6 +1856,7 @@ void scsi_scan_host(struct Scsi_Host *shost)
> return;
> }
>
> + bootdev_found(BOOTDEV_BLOCK_MASK);
> p = kthread_run(do_scan_async, data, "scsi_scan_%d", shost->host_no);
> if (IS_ERR(p))
Where are the definitions of these functions to be found?
--
Matthew Wilcox Intel Open Source Technology Centre
"Bill, look, we understand that you're interested in selling us this
operating system, but compare it to ours. We can't possibly take such
a retrograde step."
On Wed, Apr 29, 2009 at 07:35:26PM -0600, Matthew Wilcox wrote:
> On Wed, Apr 29, 2009 at 05:12:55PM -0700, David VomLehn wrote:
> > scsi_finish_async_scan(data);
> > + bootdev_probe_done(BOOTDEV_BLOCK_MASK);
> > return 0;
> > }
> >
> > @@ -1855,6 +1856,7 @@ void scsi_scan_host(struct Scsi_Host *shost)
> > return;
> > }
> >
> > + bootdev_found(BOOTDEV_BLOCK_MASK);
> > p = kthread_run(do_scan_async, data, "scsi_scan_%d", shost->host_no);
> > if (IS_ERR(p))
>
> Where are the definitions of these functions to be found?
My email has been on the flaky side and I may not have sent them to all the
right places. I'll resend.
> Matthew Wilcox Intel Open Source Technology Centre