From: rread <rread>
Date: Thu, 5 Jun 2003 04:13:01 +0000 (+0000)
Subject: merge from b_devel -> b_ad
X-Git-Tag: v1_7_100~1^92~7
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=7b9a9f0da645d99410ed5beafe4890d4e6d61cba;p=fs%2Flustre-release.git

merge from b_devel -> b_ad
  DEVEL_AD_PARENT_20030526 -> DEVEL_AD_PARENT_20030605

Large, squirrelly merge. It mounts, and acceptance_small.sh finishes
the test and then fails in cleanup, just like b_devel.
---

diff --git a/lustre/kernel_patches/patches/dev_read_only_2.4.20.patch b/lustre/kernel_patches/patches/dev_read_only_2.4.20.patch
index 55057d9..0d3476c 100644
--- a/lustre/kernel_patches/patches/dev_read_only_2.4.20.patch
+++ b/lustre/kernel_patches/patches/dev_read_only_2.4.20.patch
@@ -1,18 +1,17 @@
-
-
-
- drivers/block/blkpg.c  |   35 +++++++++++++++++++++++++++++++++++
+ drivers/block/blkpg.c  |   39 +++++++++++++++++++++++++++++++++++++++
  drivers/block/loop.c   |    3 +++
- drivers/ide/ide-disk.c |    5 ++++-
- 3 files changed, 42 insertions(+), 1 deletion(-)
+ drivers/ide/ide-disk.c |    4 ++++
+ 3 files changed, 46 insertions(+)
 
---- 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
+--- linux-2.4.20/drivers/block/blkpg.c~dev_read_only_hp	2003-04-09 15:14:54.000000000 -0600
++++ linux-2.4.20-braam/drivers/block/blkpg.c	2003-04-09 15:37:02.000000000 -0600
+@@ -296,3 +296,42 @@ int blk_ioctl(kdev_t dev, unsigned int c
  }
  
  EXPORT_SYMBOL(blk_ioctl);
 +
++  
++
 +#define NUM_DEV_NO_WRITE 16
 +static int dev_no_write[NUM_DEV_NO_WRITE];
 +
@@ -47,9 +46,11 @@
 +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
++
++
+--- linux-2.4.20/drivers/block/loop.c~dev_read_only_hp	2003-04-09 15:14:54.000000000 -0600
++++ linux-2.4.20-braam/drivers/block/loop.c	2003-04-09 15:37:02.000000000 -0600
+@@ -474,6 +474,9 @@ static int loop_make_request(request_que
  	spin_unlock_irq(&lo->lo_lock);
  
  	if (rw == WRITE) {
@@ -59,19 +60,18 @@
  		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;
-+ 	}
+--- linux-2.4.20/drivers/ide/ide-disk.c~dev_read_only_hp	2003-04-09 15:14:54.000000000 -0600
++++ linux-2.4.20-braam/drivers/ide/ide-disk.c	2003-04-09 15:37:02.000000000 -0600
+@@ -558,6 +558,10 @@ static ide_startstop_t lba_48_rw_disk (i
+  */
+ static ide_startstop_t do_rw_disk (ide_drive_t *drive, struct request *rq, unsigned long block)
+ {
++	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);
+ 		OUT_BYTE(drive->ctl,IDE_CONTROL_REG);
  
 
 _
diff --git a/lustre/scripts/llite-group.sh b/lustre/scripts/llite-group.sh
index 879a858..ed914e8 100644
--- a/lustre/scripts/llite-group.sh
+++ b/lustre/scripts/llite-group.sh
@@ -36,7 +36,7 @@ start() {
 
 stop() {
         echo -n "Shutting down $SERVICE: "
-        python2 $LCONF -v --cleanup --failover $confopt
+        python2 $LCONF -v --cleanup --force --failover $confopt
         RETVAL=$?
         echo done
 }