Remove some noisy debug messages.
i=robert.read
i=rahul.deshmukh
/**
* 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);
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)))
-
- /*
/*
* Check whether this bio extends beyond the end of the device.
*/
-@@ -1436,6 +1438,23 @@
+@@ -1436,6 +1438,12 @@
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 (should_fail_request(bio))
goto end_io;
-@@ -2189,6 +2208,91 @@
+@@ -2189,6 +2197,91 @@
}
EXPORT_SYMBOL(kblockd_flush_work);
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.27.21-0.1/include/linux/bio.h
-===================================================================
---- linux-2.6.27.21-0.1.orig/include/linux/bio.h 2009-05-22 08:38:00.000000000 -0600
-+++ linux-2.6.27.21-0.1/include/linux/bio.h 2009-05-22 08:38:02.000000000 -0600
-@@ -117,6 +117,7 @@
- #define BIO_CPU_AFFINE 8 /* complete bio on same CPU as submitted */
- #define BIO_FS_INTEGRITY 10 /* fs owns integrity data, not block layer */
- #define BIO_QUIET 11 /* Make BIO Quiet */
-+#define BIO_RDONLY 31 /* device is readonly */
- #define bio_flagged(bio, flag) ((bio)->bi_flags & (1 << (flag)))
-
- /*
struct bio_vec *bvl;
int i;
- if (bio->bi_rw == WRITE &&
- unlikely(test_and_clear_bit(BIO_RDONLY, &bio->bi_flags))) {
- struct block_device *bdev = bio->bi_bdev;
-
- CWARN("Write to readonly device %s (%#x) bi_flags: %lx, "
- "bi_vcnt: %d, bi_idx: %d, bi->size: %d, bi_cnt: %d, "
- "bi_private: %p, done: %u, error: %d\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,
- done, error);
- }
-
/* CAVEAT EMPTOR: possibly in IRQ context
* DO NOT record procfs stats here!!! */
while true; do
test_21b_sub mds$num || break;
let n_attempts=n_attempts+1
- [ $n_attemtps -gt 3] &&
+ [ $n_attempts -gt 3 ] &&
error "The test cannot check whether COS works or not: all renames are replied w/o COS"
done
restore_lustre_params < $param_file