lustre/kernel_patches/patches/dev_read_only-2.6-lnxi.patch

   1 diff -ur linux-2.6.5-lnxi.orig/drivers/block/ll_rw_blk.c linux-2.6.5-lnxi/drivers/block/ll_rw_blk.c
   2 --- linux-2.6.5-lnxi.orig/drivers/block/ll_rw_blk.c     2004-11-11 07:28:51.000000000 -0800
   3 +++ linux-2.6.5-lnxi/drivers/block/ll_rw_blk.c  2005-04-11 09:42:22.750936924 -0700
   4 @@ -2458,7 +2458,7 @@ static inline void blk_partition_remap(s
   5         }
   6  }
   7
   8 -int dev_check_rdonly(dev_t dev);
   9 +int dev_check_rdonly(struct block_device *bdev);
  10
  11  /**
  12   * generic_make_request: hand a buffer to its device driver for I/O
  13 @@ -2550,7 +2550,7 @@ end_io:
  14
  15                 /* this is cfs's dev_rdonly check */
  16                 if (bio->bi_rw == WRITE &&
  17 -                               dev_check_rdonly(bio->bi_bdev->bd_dev)) {
  18 +                               dev_check_rdonly(bio->bi_bdev)) {
  19                         bio_endio(bio, bio->bi_size, 0);
  20                         break;
  21                 }
  22 @@ -3086,53 +3086,86 @@ void swap_io_context(struct io_context *
  23         *ioc2 = temp;
  24  }
  25
  26 -#define MAX_RDONLY_DEVS                16
  27 -
  28 -static dev_t rdonly_devs[MAX_RDONLY_DEVS] = {0, };
  29 -
  30  /*
  31   * Debug code for turning block devices "read-only" (will discard writes
  32   * silently).  This is for filesystem crash/recovery testing.
  33   */
  34 -void dev_set_rdonly(struct block_device *bdev, int no_write)
  35 +struct deventry {
  36 +       dev_t dev;
  37 +       struct deventry *next;
  38 +};
  39 +
  40 +static struct deventry *devlist = NULL;
  41 +static spinlock_t devlock = SPIN_LOCK_UNLOCKED;
  42 +
  43 +int dev_check_rdonly(struct block_device *bdev)
  44  {
  45 -       if (no_write >= MAX_RDONLY_DEVS) {
  46 -               printk(KERN_ALERT "%s:%d illegal arg %d (max %d)\n",
  47 -                               __FILE__, __LINE__, no_write, MAX_RDONLY_DEVS);
  48 -               return;
  49 +       struct deventry *cur;
  50 +       if (!bdev) return 0;
  51 +       spin_lock(&devlock);
  52 +       cur = devlist;
  53 +       while(cur) {
  54 +               if (bdev->bd_dev == cur->dev) {
  55 +                       spin_unlock(&devlock);
  56 +                       return 1;
  57         }
  58 -
  59 -       if (bdev) {
  60 -               printk(KERN_WARNING "Turning device %s read-only at %d\n",
  61 -                               bdev->bd_disk ? bdev->bd_disk->disk_name : "?",
  62 -                               no_write);
  63 -               rdonly_devs[no_write] = bdev->bd_dev;
  64 +               cur = cur->next;
  65         }
  66 +       spin_unlock(&devlock);
  67 +       return 0;
  68  }
  69
  70 -void dev_clear_rdonly(int no_write)
  71 +void dev_set_rdonly(struct block_device *bdev)
  72  {
  73 -       if (no_write >= MAX_RDONLY_DEVS) {
  74 -               printk(KERN_ALERT "%s:%d illegal arg %d (max %d)\n",
  75 -                               __FILE__, __LINE__, no_write, MAX_RDONLY_DEVS);
  76 -               return;
  77 -       }
  78 +       struct deventry *newdev, *cur;
  79
  80 -       if (rdonly_devs[no_write] == 0)
  81 +       if (!bdev)
  82 +               return;
  83 +       newdev = kmalloc(sizeof(struct deventry), GFP_KERNEL);
  84 +       if (!newdev)
  85                 return;
  86
  87 -       printk(KERN_WARNING "Clearing read-only at %d\n", no_write);
  88 -       rdonly_devs[no_write] = 0;
  89 -}
  90 -
  91 -int dev_check_rdonly(dev_t dev)
  92 -{
  93 -       int i;
  94 -
  95 -       for (i = 0; i < MAX_RDONLY_DEVS; i++)
  96 -               if (rdonly_devs[i] == dev)
  97 -                       return 1;
  98 -       return 0;
  99 +       spin_lock(&devlock);
 100 +       cur = devlist;
 101 +       while(cur) {
 102 +               if (bdev->bd_dev == cur->dev) {
 103 +                       spin_unlock(&devlock);
 104 +                       kfree(newdev);
 105 +                       return;
 106 +               }
 107 +               cur = cur->next;
 108 +       }
 109 +       newdev->dev = bdev->bd_dev;
 110 +       newdev->next = devlist;
 111 +       devlist = newdev;
 112 +       spin_unlock(&devlock);
 113 +       printk(KERN_WARNING "Turning device %s (%#x) read-only\n",
 114 +              bdev->bd_disk ? bdev->bd_disk->disk_name : "", bdev->bd_dev);
 115 +}
 116 +
 117 +void dev_clear_rdonly(struct block_device *bdev)
 118 +{
 119 +       struct deventry *cur, *last = NULL;
 120 +       if (!bdev) return;
 121 +       spin_lock(&devlock);
 122 +       cur = devlist;
 123 +       while(cur) {
 124 +               if (bdev->bd_dev == cur->dev) {
 125 +                       if (last)
 126 +                               last->next = cur->next;
 127 +                       else
 128 +                               devlist = cur->next;
 129 +                       spin_unlock(&devlock);
 130 +                       kfree(cur);
 131 +                       printk(KERN_WARNING "Removing read-only on %s (%#x)\n",
 132 +                              bdev->bd_disk ? bdev->bd_disk->disk_name :
 133 +                                              "unknown block", bdev->bd_dev);
 134 +                       return;
 135 +               }
 136 +               last = cur;
 137 +               cur = cur->next;
 138 +       }
 139 +       spin_unlock(&devlock);
 140  }
 141
 142  EXPORT_SYMBOL(dev_set_rdonly);
 143 diff -ur linux-2.6.5-lnxi.orig/fs/block_dev.c linux-2.6.5-lnxi/fs/block_dev.c
 144 --- linux-2.6.5-lnxi.orig/fs/block_dev.c        2004-11-11 07:28:30.000000000 -0800
 145 +++ linux-2.6.5-lnxi/fs/block_dev.c     2005-04-11 09:49:01.891407856 -0700
 146 @@ -739,6 +739,7 @@ int blkdev_put(struct block_device *bdev
 147         }
 148         unlock_kernel();
 149         up(&bdev->bd_sem);
 150 +       dev_clear_rdonly(bdev);
 151         bdput(bdev);
 152         return ret;
 153  }
 154 diff -ur linux-2.6.5-lnxi.orig/include/linux/fs.h linux-2.6.5-lnxi/include/linux/fs.h
 155 --- linux-2.6.5-lnxi.orig/include/linux/fs.h    2004-11-11 07:28:45.000000000 -0800
 156 +++ linux-2.6.5-lnxi/include/linux/fs.h 2005-04-11 09:43:27.423116140 -0700
 157 @@ -1385,6 +1385,10 @@ extern void file_kill(struct file *f);
 158  struct bio;
 159  extern int submit_bio(int, struct bio *);
 160  extern int bdev_read_only(struct block_device *);
 161 +#define HAVE_CLEAR_RDONLY_ON_PUT
 162 +void dev_set_rdonly(struct block_device *bdev);
 163 +int dev_check_rdonly(struct block_device *bdev);
 164 +void dev_clear_rdonly(struct block_device *bdev);
 165  extern int set_blocksize(struct block_device *, int);
 166  extern int sb_set_blocksize(struct super_block *, int);
 167  extern int sb_min_blocksize(struct super_block *, int);