git://git.camperquake.de
/
zfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove Chaos 4.x RPM support
[zfs.git]
/
module
/
zfs
/
vdev_disk.c
diff --git
a/module/zfs/vdev_disk.c
b/module/zfs/vdev_disk.c
index
5cb3fe2
..
28a4861
100644
(file)
--- a/
module/zfs/vdev_disk.c
+++ b/
module/zfs/vdev_disk.c
@@
-87,10
+87,10
@@
bdev_capacity(struct block_device *bdev)
/* The partition capacity referenced by the block device */
if (part)
/* The partition capacity referenced by the block device */
if (part)
-
return part->nr_sects
;
+
return (part->nr_sects << 9)
;
/* Otherwise assume the full device capacity */
/* Otherwise assume the full device capacity */
- return
get_capacity(bdev->bd_disk
);
+ return
(get_capacity(bdev->bd_disk) << 9
);
}
static void
}
static void
@@
-218,7
+218,7
@@
vdev_disk_open(vdev_t *v, uint64_t *psize, uint64_t *ashift)
v->vdev_nowritecache = B_FALSE;
/* Physical volume size in bytes */
v->vdev_nowritecache = B_FALSE;
/* Physical volume size in bytes */
- *psize = bdev_capacity(bdev)
* block_size
;
+ *psize = bdev_capacity(bdev);
/* Based on the minimum sector size set the block size */
*ashift = highbit(MAX(block_size, SPA_MINBLOCKSIZE)) - 1;
/* Based on the minimum sector size set the block size */
*ashift = highbit(MAX(block_size, SPA_MINBLOCKSIZE)) - 1;
@@
-417,7
+417,7
@@
__vdev_disk_physio(struct block_device *bdev, zio_t *zio, caddr_t kbuf_ptr,
caddr_t bio_ptr;
uint64_t bio_offset;
int bio_size, bio_count = 16;
caddr_t bio_ptr;
uint64_t bio_offset;
int bio_size, bio_count = 16;
- int i = 0, error = 0
, block_size
;
+ int i = 0, error = 0;
ASSERT3U(kbuf_offset + kbuf_size, <=, bdev->bd_inode->i_size);
ASSERT3U(kbuf_offset + kbuf_size, <=, bdev->bd_inode->i_size);
@@
-431,7
+431,6
@@
retry:
dr->dr_zio = zio;
dr->dr_rw = flags;
dr->dr_zio = zio;
dr->dr_rw = flags;
- block_size = vdev_bdev_block_size(bdev);
/*
* When the IO size exceeds the maximum bio size for the request
/*
* When the IO size exceeds the maximum bio size for the request
@@
-472,7
+471,7
@@
retry:
vdev_disk_dio_get(dr);
dr->dr_bio[i]->bi_bdev = bdev;
vdev_disk_dio_get(dr);
dr->dr_bio[i]->bi_bdev = bdev;
- dr->dr_bio[i]->bi_sector = bio_offset
/ block_size
;
+ dr->dr_bio[i]->bi_sector = bio_offset
>> 9
;
dr->dr_bio[i]->bi_rw = dr->dr_rw;
dr->dr_bio[i]->bi_end_io = vdev_disk_physio_completion;
dr->dr_bio[i]->bi_private = dr;
dr->dr_bio[i]->bi_rw = dr->dr_rw;
dr->dr_bio[i]->bi_end_io = vdev_disk_physio_completion;
dr->dr_bio[i]->bi_private = dr;
@@
-560,7
+559,7
@@
vdev_disk_io_flush(struct block_device *bdev, zio_t *zio)
bio->bi_private = zio;
bio->bi_bdev = bdev;
zio->io_delay = jiffies_64;
bio->bi_private = zio;
bio->bi_bdev = bdev;
zio->io_delay = jiffies_64;
- submit_bio(
WRITE_BARRIER
, bio);
+ submit_bio(
VDEV_WRITE_FLUSH_FUA
, bio);
return 0;
}
return 0;
}
@@
-715,7
+714,7
@@
vdev_disk_read_rootlabel(char *devpath, char *devid, nvlist_t **config)
if (IS_ERR(bdev))
return -PTR_ERR(bdev);
if (IS_ERR(bdev))
return -PTR_ERR(bdev);
- s = bdev_capacity(bdev)
* vdev_bdev_block_size(bdev)
;
+ s = bdev_capacity(bdev);
if (s == 0) {
vdev_bdev_close(bdev, vdev_bdev_mode(FREAD));
return EIO;
if (s == 0) {
vdev_bdev_close(bdev, vdev_bdev_mode(FREAD));
return EIO;
@@
-763,4
+762,4
@@
vdev_disk_read_rootlabel(char *devpath, char *devid, nvlist_t **config)
}
module_param(zfs_vdev_scheduler, charp, 0644);
}
module_param(zfs_vdev_scheduler, charp, 0644);
-MODULE_PARM_DESC(zfs_vdev_scheduler, "I
O Scheduler (noop)
");
+MODULE_PARM_DESC(zfs_vdev_scheduler, "I
/O scheduler
");