diff options
| author | Igor Mammedov <niallain@gmail.com> | 2008-04-28 23:08:21 +0000 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-04-28 23:08:21 +0000 |
| commit | e9f20d6f03e8df393b001dab6dc5226c2a5daf57 (patch) | |
| tree | 73e94fa5e4f83576c97e36187b809c5aad2ade30 /drivers/s390/block | |
| parent | bf62fd887cab230f5952b611bde25e8e15acb454 (diff) | |
| parent | e31a94ed371c70855eb30b77c490d6d85dd4da26 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/s390/block')
| -rw-r--r-- | drivers/s390/block/dcssblk.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/s390/block/dcssblk.c b/drivers/s390/block/dcssblk.c index 04787eab101..bb52d2fbac1 100644 --- a/drivers/s390/block/dcssblk.c +++ b/drivers/s390/block/dcssblk.c @@ -36,7 +36,7 @@ static int dcssblk_open(struct inode *inode, struct file *filp); static int dcssblk_release(struct inode *inode, struct file *filp); static int dcssblk_make_request(struct request_queue *q, struct bio *bio); static int dcssblk_direct_access(struct block_device *bdev, sector_t secnum, - unsigned long *data); + void **kaddr, unsigned long *pfn); static char dcssblk_segments[DCSSBLK_PARM_LEN] = "\0"; @@ -636,7 +636,7 @@ fail: static int dcssblk_direct_access (struct block_device *bdev, sector_t secnum, - unsigned long *data) + void **kaddr, unsigned long *pfn) { struct dcssblk_dev_info *dev_info; unsigned long pgoff; @@ -649,7 +649,9 @@ dcssblk_direct_access (struct block_device *bdev, sector_t secnum, pgoff = secnum / (PAGE_SIZE / 512); if ((pgoff+1)*PAGE_SIZE-1 > dev_info->end - dev_info->start) return -ERANGE; - *data = (unsigned long) (dev_info->start+pgoff*PAGE_SIZE); + *kaddr = (void *) (dev_info->start+pgoff*PAGE_SIZE); + *pfn = virt_to_phys(*kaddr) >> PAGE_SHIFT; + return 0; } |