Whamcloud - gitweb
merge b_devel into HEAD, which will become 0.7.3
[fs/lustre-release.git] / lustre / kernel_patches / patches / dev_read_only_2.4.20-rh.patch
1  drivers/block/blkpg.c  |   35 +++++++++++++++++++++++++++++++++++
2  drivers/block/loop.c   |    3 +++
3  drivers/ide/ide-disk.c |    5 +++++
4  3 files changed, 43 insertions(+)
5
6 --- kernel-2.4.20-6chaos_18_7/drivers/block/blkpg.c~dev_read_only_2.4.20-rh     2003-05-15 21:12:48.000000000 -0600
7 +++ kernel-2.4.20-6chaos_18_7-braam/drivers/block/blkpg.c       2003-07-12 15:10:31.000000000 -0600
8 @@ -297,3 +297,38 @@ int blk_ioctl(kdev_t dev, unsigned int c
9  }
10  
11  EXPORT_SYMBOL(blk_ioctl);
12 +
13 +#define NUM_DEV_NO_WRITE 16
14 +static int dev_no_write[NUM_DEV_NO_WRITE];
15 +
16 +/*
17 + * Debug code for turning block devices "read-only" (will discard writes
18 + * silently).  This is for filesystem crash/recovery testing.
19 + */
20 +void dev_set_rdonly(kdev_t dev, int no_write)
21 +{
22 +       if (dev) {
23 +               printk(KERN_WARNING "Turning device %s read-only\n",
24 +                      bdevname(dev));
25 +               dev_no_write[no_write] = 0xdead0000 + dev;
26 +       }
27 +}
28 +
29 +int dev_check_rdonly(kdev_t dev) {
30 +       int i;
31 +
32 +       for (i = 0; i < NUM_DEV_NO_WRITE; i++) {
33 +               if ((dev_no_write[i] & 0xffff0000) == 0xdead0000 &&
34 +                   dev == (dev_no_write[i] & 0xffff))
35 +                       return 1;
36 +       }
37 +       return 0;
38 +}
39 +
40 +void dev_clear_rdonly(int no_write) {
41 +       dev_no_write[no_write] = 0;
42 +}
43 +
44 +EXPORT_SYMBOL(dev_set_rdonly);
45 +EXPORT_SYMBOL(dev_check_rdonly);
46 +EXPORT_SYMBOL(dev_clear_rdonly);
47 --- kernel-2.4.20-6chaos_18_7/drivers/block/loop.c~dev_read_only_2.4.20-rh      2003-05-15 21:12:50.000000000 -0600
48 +++ kernel-2.4.20-6chaos_18_7-braam/drivers/block/loop.c        2003-07-12 15:10:31.000000000 -0600
49 @@ -491,6 +491,9 @@ static int loop_make_request(request_que
50         spin_unlock_irq(&lo->lo_lock);
51  
52         if (rw == WRITE) {
53 +               if (dev_check_rdonly(rbh->b_rdev))
54 +                       goto err;
55 +
56                 if (lo->lo_flags & LO_FLAGS_READ_ONLY)
57                         goto err;
58         } else if (rw == READA) {
59 --- kernel-2.4.20-6chaos_18_7/drivers/ide/ide-disk.c~dev_read_only_2.4.20-rh    2003-05-15 21:13:09.000000000 -0600
60 +++ kernel-2.4.20-6chaos_18_7-braam/drivers/ide/ide-disk.c      2003-07-12 15:12:03.000000000 -0600
61 @@ -371,6 +371,11 @@ ide_startstop_t __ide_do_rw_disk (ide_dr
62         if (driver_blocked)
63                 panic("Request while ide driver is blocked?");
64  
65 +       if (rq->cmd == WRITE && dev_check_rdonly(rq->rq_dev)) {
66 +               ide_end_request(1, HWGROUP(drive));
67 +               return ide_stopped;
68 +       }
69 +
70         if (IDE_CONTROL_REG)
71                 hwif->OUTB(drive->ctl, IDE_CONTROL_REG);
72  
73
74 _