- tagging RC_CURRENT

[fs/lustre-release.git] / lustre / kernel_patches / patches / dev_read_only_2.4.20-rh.patch

diff --git a/lustre/kernel_patches/patches/dev_read_only_2.4.20-rh.patch b/lustre/kernel_patches/patches/dev_read_only_2.4.20-rh.patch
index 55057d9..d3fa230 100644 (file)
--- a/lustre/kernel_patches/patches/dev_read_only_2.4.20-rh.patch
+++ b/lustre/kernel_patches/patches/dev_read_only_2.4.20-rh.patch
@@ -1,14 +1,8 @@
-
-
-
- drivers/block/blkpg.c  |   35 +++++++++++++++++++++++++++++++++++
- drivers/block/loop.c   |    3 +++
- drivers/ide/ide-disk.c |    5 ++++-
- 3 files changed, 42 insertions(+), 1 deletion(-)
-
---- rh-2.4.20/drivers/block/blkpg.c~dev_read_only_2.4.20       2003-04-11 14:05:03.000000000 +0800
-+++ rh-2.4.20-root/drivers/block/blkpg.c       2003-04-12 13:11:31.000000000 +0800
-@@ -297,3 +297,38 @@ int blk_ioctl(kdev_t dev, unsigned int c
+Index: linux-2.4.20-rh/drivers/block/blkpg.c
+===================================================================
+--- linux-2.4.20-rh.orig/drivers/block/blkpg.c 2003-07-22 16:02:29.000000000 +0800
++++ linux-2.4.20-rh/drivers/block/blkpg.c      2003-12-09 17:33:09.000000000 +0800
+@@ -297,3 +297,38 @@
  }
  
  EXPORT_SYMBOL(blk_ioctl);
@@ -47,31 +41,18 @@
 +EXPORT_SYMBOL(dev_set_rdonly);
 +EXPORT_SYMBOL(dev_check_rdonly);
 +EXPORT_SYMBOL(dev_clear_rdonly);
---- rh-2.4.20/drivers/block/loop.c~dev_read_only_2.4.20        2003-04-11 14:05:08.000000000 +0800
-+++ rh-2.4.20-root/drivers/block/loop.c        2003-04-12 13:11:31.000000000 +0800
-@@ -491,6 +491,9 @@ static int loop_make_request(request_que
-       spin_unlock_irq(&lo->lo_lock);
- 
-       if (rw == WRITE) {
-+              if (dev_check_rdonly(rbh->b_rdev))
-+                      goto err;
-+
-               if (lo->lo_flags & LO_FLAGS_READ_ONLY)
-                       goto err;
-       } else if (rw == READA) {
---- rh-2.4.20/drivers/ide/ide-disk.c~dev_read_only_2.4.20      2003-04-11 14:04:53.000000000 +0800
-+++ rh-2.4.20-root/drivers/ide/ide-disk.c      2003-04-12 13:14:48.000000000 +0800
-@@ -381,7 +381,10 @@ static ide_startstop_t do_rw_disk (ide_d
-       if (IS_PDC4030_DRIVE)
-               return promise_rw_disk(drive, rq, block);
- #endif /* CONFIG_BLK_DEV_PDC4030 */
--
-+      if (rq->cmd == WRITE && dev_check_rdonly(rq->rq_dev)) {
-+              ide_end_request(1, HWGROUP(drive));
-+              return ide_stopped;
-+      }
-       if (IDE_CONTROL_REG)
-               hwif->OUTB(drive->ctl, IDE_CONTROL_REG);
+Index: linux-2.4.20-rh/drivers/block/ll_rw_blk.c
+===================================================================
+--- linux-2.4.20-rh.orig/drivers/block/ll_rw_blk.c     2003-07-22 16:02:34.000000000 +0800
++++ linux-2.4.20-rh/drivers/block/ll_rw_blk.c  2003-12-09 17:39:38.000000000 +0800
+@@ -1183,6 +1183,10 @@
+                       buffer_IO_error(bh);
+                       break;
+               }
++                if ((rw & WRITE)&&(dev_check_rdonly(bh->b_rdev))) {
++                        bh->b_end_io(bh, 0);
++                        break;
++                }
+       } while (q->make_request_fn(q, rw, bh));
+ }
  
-
-_