Commit 4d45d920 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] ppc64 iSeries: allow read only virtual disks

From: Stephen Rothwell <sfr@canb.auug.org.au>

It is possible to attach a virtual disk to a logical partition on an iSeries
machine so that it is read only to the partition.  This patch allows Linux to
use such virtual disks.
parent 2c3956c9
...@@ -175,6 +175,13 @@ static int viodasd_open(struct inode *ino, struct file *fil) ...@@ -175,6 +175,13 @@ static int viodasd_open(struct inode *ino, struct file *fil)
struct viodasd_device *d = ino->i_bdev->bd_disk->private_data; struct viodasd_device *d = ino->i_bdev->bd_disk->private_data;
HvLpEvent_Rc hvrc; HvLpEvent_Rc hvrc;
struct viodasd_waitevent we; struct viodasd_waitevent we;
u16 flags = 0;
if (d->read_only) {
if ((fil != NULL) && (fil->f_mode & FMODE_WRITE))
return -EROFS;
flags = vioblockflags_ro;
}
init_completion(&we.com); init_completion(&we.com);
...@@ -186,7 +193,7 @@ static int viodasd_open(struct inode *ino, struct file *fil) ...@@ -186,7 +193,7 @@ static int viodasd_open(struct inode *ino, struct file *fil)
viopath_sourceinst(viopath_hostLp), viopath_sourceinst(viopath_hostLp),
viopath_targetinst(viopath_hostLp), viopath_targetinst(viopath_hostLp),
(u64)(unsigned long)&we, VIOVERSION << 16, (u64)(unsigned long)&we, VIOVERSION << 16,
((u64)DEVICE_NO(d) << 48) /* | ((u64)flags << 32) */, ((u64)DEVICE_NO(d) << 48) | ((u64)flags << 32),
0, 0, 0); 0, 0, 0);
if (hvrc != 0) { if (hvrc != 0) {
printk(VIOD_KERN_WARNING "HV open failed %d\n", (int)hvrc); printk(VIOD_KERN_WARNING "HV open failed %d\n", (int)hvrc);
...@@ -456,7 +463,9 @@ static void probe_disk(struct viodasd_device *d) ...@@ -456,7 +463,9 @@ static void probe_disk(struct viodasd_device *d)
int dev_no = DEVICE_NO(d); int dev_no = DEVICE_NO(d);
struct gendisk *g; struct gendisk *g;
struct request_queue *q; struct request_queue *q;
u16 flags = 0;
retry:
init_completion(&we.com); init_completion(&we.com);
/* Send the open event to OS/400 */ /* Send the open event to OS/400 */
...@@ -467,7 +476,7 @@ static void probe_disk(struct viodasd_device *d) ...@@ -467,7 +476,7 @@ static void probe_disk(struct viodasd_device *d)
viopath_sourceinst(viopath_hostLp), viopath_sourceinst(viopath_hostLp),
viopath_targetinst(viopath_hostLp), viopath_targetinst(viopath_hostLp),
(u64)(unsigned long)&we, VIOVERSION << 16, (u64)(unsigned long)&we, VIOVERSION << 16,
((u64)dev_no << 48) | ((u64)vioblockflags_ro << 32), ((u64)dev_no << 48) | ((u64)flags<< 32),
0, 0, 0); 0, 0, 0);
if (hvrc != 0) { if (hvrc != 0) {
printk(VIOD_KERN_WARNING "bad rc on HV open %d\n", (int)hvrc); printk(VIOD_KERN_WARNING "bad rc on HV open %d\n", (int)hvrc);
...@@ -476,8 +485,13 @@ static void probe_disk(struct viodasd_device *d) ...@@ -476,8 +485,13 @@ static void probe_disk(struct viodasd_device *d)
wait_for_completion(&we.com); wait_for_completion(&we.com);
if (we.rc != 0) if (we.rc != 0) {
return; if (flags != 0)
return;
/* try again with read only flag set */
flags = vioblockflags_ro;
goto retry;
}
if (we.max_disk > (MAX_DISKNO - 1)) { if (we.max_disk > (MAX_DISKNO - 1)) {
static int warned; static int warned;
...@@ -498,7 +512,7 @@ static void probe_disk(struct viodasd_device *d) ...@@ -498,7 +512,7 @@ static void probe_disk(struct viodasd_device *d)
viopath_sourceinst(viopath_hostLp), viopath_sourceinst(viopath_hostLp),
viopath_targetinst(viopath_hostLp), viopath_targetinst(viopath_hostLp),
0, VIOVERSION << 16, 0, VIOVERSION << 16,
((u64)dev_no << 48) | ((u64)vioblockflags_ro << 32), ((u64)dev_no << 48) | ((u64)flags << 32),
0, 0, 0); 0, 0, 0);
if (hvrc != 0) { if (hvrc != 0) {
printk(VIOD_KERN_WARNING printk(VIOD_KERN_WARNING
...@@ -506,11 +520,12 @@ static void probe_disk(struct viodasd_device *d) ...@@ -506,11 +520,12 @@ static void probe_disk(struct viodasd_device *d)
return; return;
} }
printk(VIOD_KERN_INFO "disk %d: %lu sectors (%lu MB) " printk(VIOD_KERN_INFO "disk %d: %lu sectors (%lu MB) "
"CHS=%d/%d/%d sector size %d\n", "CHS=%d/%d/%d sector size %d%s\n",
dev_no, (unsigned long)(d->size >> 9), dev_no, (unsigned long)(d->size >> 9),
(unsigned long)(d->size >> 20), (unsigned long)(d->size >> 20),
(int)d->cylinders, (int)d->tracks, (int)d->cylinders, (int)d->tracks,
(int)d->sectors, (int)d->bytes_per_sector); (int)d->sectors, (int)d->bytes_per_sector,
d->read_only ? " (RO)" : "");
/* create the request queue for the disk */ /* create the request queue for the disk */
spin_lock_init(&d->q_lock); spin_lock_init(&d->q_lock);
q = blk_init_queue(do_viodasd_request, &d->q_lock); q = blk_init_queue(do_viodasd_request, &d->q_lock);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment