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