Update of /cvsroot/gc-linux/linux/drivers/block/gcn-di
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8809/drivers/block/gcn-di
Modified Files:
gcn-di.c
Log Message:
Fix scheduling while atomic case.
Index: gcn-di.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/block/gcn-di/gcn-di.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- gcn-di.c 10 Jul 2005 15:14:36 -0000 1.10
+++ gcn-di.c 14 Nov 2005 19:38:41 -0000 1.11
@@ -1651,6 +1651,13 @@
goto out;
}
+ /* this will take care of validating the media */
+ check_disk_change(inode->i_bdev);
+ if (!ddev->nr_sectors) {
+ retval = -ENOMEDIUM;
+ goto out;
+ }
+
spin_lock_irqsave(&ddev->queue_lock, flags);
/* honor exclusive open mode */
@@ -1673,13 +1680,6 @@
spin_lock_irqsave(&ddev->queue_lock, flags);
}
- /* this will take care of validating the media */
- check_disk_change(inode->i_bdev);
- if (!ddev->nr_sectors) {
- retval = -ENOMEDIUM;
- goto out_unlock;
- }
-
if ((filp->f_flags & O_EXCL))
ddev->ref_count = -1;
else
|