X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fkernel_patches%2Fpatches%2Fdev_read_only-2.6.18-vanilla.patch;h=39c3b62ecc9cad3a3ba8ce55d035ac80ebb4263f;hb=e550abd05cf7ffddaedbef996be1baaae0912b4a;hp=7da8a71a97aaefacf464b04a72c91c1c4fdd7352;hpb=2ececcfb12ea2d5ce7fd26c0c702f0c5be555d1f;p=fs%2Flustre-release.git

diff --git a/lustre/kernel_patches/patches/dev_read_only-2.6.18-vanilla.patch b/lustre/kernel_patches/patches/dev_read_only-2.6.18-vanilla.patch
index 7da8a71..39c3b62 100644
--- a/lustre/kernel_patches/patches/dev_read_only-2.6.18-vanilla.patch
+++ b/lustre/kernel_patches/patches/dev_read_only-2.6.18-vanilla.patch
@@ -11,31 +11,20 @@ Index: linux-2.6.18.1/block/ll_rw_blk.c
  /**
   * generic_make_request: hand a buffer to its device driver for I/O
   * @bio:  The bio describing the location in memory and on the device.
-@@ -3151,6 +3153,23 @@ end_io:
+@@ -3151,6 +3153,12 @@ end_io:
  
  		if (unlikely(test_bit(QUEUE_FLAG_DEAD, &q->queue_flags)))
  			goto end_io;
 
 +               /* this is cfs's dev_rdonly check */
 +               if (bio_rw(bio) == WRITE && dev_check_rdonly(bio->bi_bdev)) {
-+                       struct block_device *bdev = bio->bi_bdev;
-+
-+                       printk(KERN_WARNING "Write to readonly device %s (%#x) "
-+                              "bi_flags: %lx, bi_vcnt: %d, bi_idx: %d, "
-+                              "bi->size: %d, bi_cnt: %d, bi_private: %p\n",
-+                              bdev->bd_disk ? bdev->bd_disk->disk_name : "",
-+                              bdev->bd_dev, bio->bi_flags, bio->bi_vcnt,
-+                              bio->bi_idx, bio->bi_size,
-+                              atomic_read(&bio->bi_cnt), bio->bi_private);
-+                       set_bit(BIO_RDONLY, &bio->bi_flags);
 +                       bio_endio(bio, bio->bi_size, 0);
-+                       clear_bit(BIO_RDONLY, &bio->bi_flags);
 +                       break;
 +               }
 +
  		/*
  		 * If this device has partitions, remap block n
-@@ -3765,6 +3784,91 @@ void swap_io_context(struct io_context *
+@@ -3765,6 +3773,91 @@ void swap_io_context(struct io_context *
  	*ioc2 = temp;
  }
  EXPORT_SYMBOL(swap_io_context);
@@ -154,15 +143,3 @@ Index: linux-2.6.18.1/include/linux/fs.h
  extern int set_blocksize(struct block_device *, int);
  extern int sb_set_blocksize(struct super_block *, int);
  extern int sb_min_blocksize(struct super_block *, int);
-Index: linux-2.6.18.1/include/linux/bio.h
-===================================================================
---- linux-2.6.18.1.orig/include/linux/bio.h
-+++ linux-2.6.18.1/include/linux/bio.h
-@@ -124,6 +124,7 @@ struct bio {
- #define BIO_BOUNCED	5	/* bio is a bounce bio */
- #define BIO_USER_MAPPED 6	/* contains user pages */
- #define BIO_EOPNOTSUPP	7	/* not supported */
-+#define BIO_RDONLY	31	/* device is readonly */
- #define bio_flagged(bio, flag)	((bio)->bi_flags & (1 << (flag)))
- 
- /*