Whamcloud - gitweb
- merge 0.7rc1 from b_devel to HEAD (20030612 merge point)
[fs/lustre-release.git] / lustre / kernel_patches / patches / dev_read_only_2.4.20.patch
1  drivers/block/blkpg.c  |   39 +++++++++++++++++++++++++++++++++++++++
2  drivers/block/loop.c   |    3 +++
3  drivers/ide/ide-disk.c |    4 ++++
4  3 files changed, 46 insertions(+)
5
6 --- linux-2.4.20/drivers/block/blkpg.c~dev_read_only_hp 2003-04-09 15:14:54.000000000 -0600
7 +++ linux-2.4.20-braam/drivers/block/blkpg.c    2003-04-09 15:37:02.000000000 -0600
8 @@ -296,3 +296,42 @@ int blk_ioctl(kdev_t dev, unsigned int c
9  }
10  
11  EXPORT_SYMBOL(blk_ioctl);
12 +
13 +  
14 +
15 +#define NUM_DEV_NO_WRITE 16
16 +static int dev_no_write[NUM_DEV_NO_WRITE];
17 +
18 +/*
19 + * Debug code for turning block devices "read-only" (will discard writes
20 + * silently).  This is for filesystem crash/recovery testing.
21 + */
22 +void dev_set_rdonly(kdev_t dev, int no_write)
23 +{
24 +       if (dev) {
25 +               printk(KERN_WARNING "Turning device %s read-only\n",
26 +                      bdevname(dev));
27 +               dev_no_write[no_write] = 0xdead0000 + dev;
28 +       }
29 +}
30 +
31 +int dev_check_rdonly(kdev_t dev) {
32 +       int i;
33 +
34 +       for (i = 0; i < NUM_DEV_NO_WRITE; i++) {
35 +               if ((dev_no_write[i] & 0xffff0000) == 0xdead0000 &&
36 +                   dev == (dev_no_write[i] & 0xffff))
37 +                       return 1;
38 +       }
39 +       return 0;
40 +}
41 +
42 +void dev_clear_rdonly(int no_write) {
43 +       dev_no_write[no_write] = 0;
44 +}
45 +
46 +EXPORT_SYMBOL(dev_set_rdonly);
47 +EXPORT_SYMBOL(dev_check_rdonly);
48 +EXPORT_SYMBOL(dev_clear_rdonly);
49 +
50 +
51 --- linux-2.4.20/drivers/block/loop.c~dev_read_only_hp  2003-04-09 15:14:54.000000000 -0600
52 +++ linux-2.4.20-braam/drivers/block/loop.c     2003-04-09 15:37:02.000000000 -0600
53 @@ -474,6 +474,9 @@ static int loop_make_request(request_que
54         spin_unlock_irq(&lo->lo_lock);
55  
56         if (rw == WRITE) {
57 +               if (dev_check_rdonly(rbh->b_rdev))
58 +                       goto err;
59 +
60                 if (lo->lo_flags & LO_FLAGS_READ_ONLY)
61                         goto err;
62         } else if (rw == READA) {
63 --- linux-2.4.20/drivers/ide/ide-disk.c~dev_read_only_hp        2003-04-09 15:14:54.000000000 -0600
64 +++ linux-2.4.20-braam/drivers/ide/ide-disk.c   2003-04-09 15:37:02.000000000 -0600
65 @@ -558,6 +558,10 @@ static ide_startstop_t lba_48_rw_disk (i
66   */
67  static ide_startstop_t do_rw_disk (ide_drive_t *drive, struct request *rq, unsigned long block)
68  {
69 +       if (rq->cmd == WRITE && dev_check_rdonly(rq->rq_dev)) {
70 +               ide_end_request(1, HWGROUP(drive));
71 +               return ide_stopped;
72 +       }
73         if (IDE_CONTROL_REG)
74                 OUT_BYTE(drive->ctl,IDE_CONTROL_REG);
75  
76
77 _