b=20533 set the default max_sectors to the raid5/6 stripe size

[fs/lustre-release.git] / lustre / kernel_patches / patches / dev_read_only-2.6-fc5.patch

diff --git a/lustre/kernel_patches/patches/dev_read_only-2.6-fc5.patch b/lustre/kernel_patches/patches/dev_read_only-2.6-fc5.patch
index 51c7f66..ddc13f0 100644 (file)
--- a/lustre/kernel_patches/patches/dev_read_only-2.6-fc5.patch
+++ b/lustre/kernel_patches/patches/dev_read_only-2.6-fc5.patch
@@ -16,7 +16,7 @@ Index: linux-2.6.16.i686/block/ll_rw_blk.c
                if (unlikely(test_bit(QUEUE_FLAG_DEAD, &q->queue_flags)))
                        goto end_io;
 +              /* this is cfs's dev_rdonly check */
-+              if (bio->bi_rw == WRITE &&
++              if (bio_rw(bio) == WRITE &&
 +                              dev_check_rdonly(bio->bi_bdev)) {
 +                      bio_endio(bio, bio->bi_size, 0);
 +                      break;
@@ -130,16 +130,17 @@ Index: linux-2.6.16.i686/fs/block_dev.c
        up(&bdev->bd_sem);
 Index: linux-2.6.16.i686/include/linux/fs.h
 ===================================================================
---- linux-2.6.16.i686.orig/include/linux/fs.h
-+++ linux-2.6.16.i686/include/linux/fs.h
-@@ -1595,6 +1595,10 @@ extern void file_kill(struct file *f);
- struct bio;
- extern void submit_bio(int, struct bio *);
- extern int bdev_read_only(struct block_device *);
+--- linux-2.6.16.i686.orig/include/linux/blkdev.h
++++ linux-2.6.16.i686/include/linux/blkdev.h
+@@ -1595,6 +1595,11 @@ extern void file_kill(struct file *f);
+ } \
+ )
+ #endif 
++
 +#define HAVE_CLEAR_RDONLY_ON_PUT
 +void dev_set_rdonly(struct block_device *bdev);
 +int dev_check_rdonly(struct block_device *bdev);
 +void dev_clear_rdonly(struct block_device *bdev);
- 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);
+ 
+ #define MODULE_ALIAS_BLOCKDEV(major,minor) \
+       MODULE_ALIAS("block-major-" __stringify(major) "-" __stringify(minor))