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
Illumos #1948: zpool list should show more detailed pool info
[zfs.git]
/
module
/
zfs
/
vdev_disk.c
diff --git
a/module/zfs/vdev_disk.c
b/module/zfs/vdev_disk.c
index
fd40b10
..
ffb2980
100644
(file)
--- a/
module/zfs/vdev_disk.c
+++ b/
module/zfs/vdev_disk.c
@@
-224,7
+224,8
@@
vdev_disk_rrpart(const char *path, int mode, vdev_disk_t *vd)
}
static int
}
static int
-vdev_disk_open(vdev_t *v, uint64_t *psize, uint64_t *ashift)
+vdev_disk_open(vdev_t *v, uint64_t *psize, uint64_t *max_psize,
+ uint64_t *ashift)
{
struct block_device *bdev = ERR_PTR(-ENXIO);
vdev_disk_t *vd;
{
struct block_device *bdev = ERR_PTR(-ENXIO);
vdev_disk_t *vd;
@@
-288,6
+289,9
@@
vdev_disk_open(vdev_t *v, uint64_t *psize, uint64_t *ashift)
/* Physical volume size in bytes */
*psize = bdev_capacity(bdev);
/* Physical volume size in bytes */
*psize = bdev_capacity(bdev);
+ /* TODO: report possible expansion size */
+ *max_psize = *psize;
+
/* 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;