lustre/patches/ubd-io-fail-2.4.18

   1 --- lum/arch/um/drivers/ubd.c.orig      Wed Mar 13 14:04:59 2002
   2 +++ lum/arch/um/drivers/ubd.c   Thu Mar 28 23:39:15 2002
   3 @@ -693,14 +697,23 @@
   4                 spin_unlock(&io_request_lock);
   5                 return(1);
   6         }
   7 -       if((req->cmd == WRITE) &&
   8 -          ((dev->openflags & O_ACCMODE) == O_RDONLY)){
   9 -               printk("Write attempted on readonly ubd device %d\n",
  10 -                      minor(req->rq_dev));
  11 -               spin_lock(&io_request_lock);
  12 -               end_request(0);
  13 -               spin_unlock(&io_request_lock);
  14 -               return(1);
  15 +       if (req->cmd == WRITE) {
  16 +#ifdef CONFIG_DEV_RDONLY
  17 +               if (dev_check_rdonly(req->rq_dev)) {
  18 +                       spin_lock(&io_request_lock);
  19 +                       end_request(1);
  20 +                       spin_unlock(&io_request_lock);
  21 +                       return(0);
  22 +               }
  23 +#endif
  24 +               if ((dev->openflags & O_ACCMODE) == O_RDONLY) {
  25 +                       printk("Write attempted on readonly ubd device %d\n",
  26 +                              minor(req->rq_dev));
  27 +                       spin_lock(&io_request_lock);
  28 +                       end_request(0);
  29 +                       spin_unlock(&io_request_lock);
  30 +                       return(1);
  31 +               }
  32         }
  33
  34          block = req->sector;