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
Verify the return value for warn_unused_result functions
[zfs.git]
/
module
/
zfs
/
vdev_mirror.c
diff --git
a/module/zfs/vdev_mirror.c
b/module/zfs/vdev_mirror.c
index
96623d2
..
a2671ca
100644
(file)
--- a/
module/zfs/vdev_mirror.c
+++ b/
module/zfs/vdev_mirror.c
@@
-23,6
+23,10
@@
* Use is subject to license terms.
*/
* Use is subject to license terms.
*/
+/*
+ * Copyright (c) 2012 by Delphix. All rights reserved.
+ */
+
#include <sys/zfs_context.h>
#include <sys/spa.h>
#include <sys/vdev_impl.h>
#include <sys/zfs_context.h>
#include <sys/spa.h>
#include <sys/vdev_impl.h>
@@
-127,7
+131,8
@@
vdev_mirror_map_alloc(zio_t *zio)
}
static int
}
static int
-vdev_mirror_open(vdev_t *vd, uint64_t *asize, uint64_t *ashift)
+vdev_mirror_open(vdev_t *vd, uint64_t *asize, uint64_t *max_asize,
+ uint64_t *ashift)
{
int numerrors = 0;
int lasterror = 0;
{
int numerrors = 0;
int lasterror = 0;
@@
-150,6
+155,7
@@
vdev_mirror_open(vdev_t *vd, uint64_t *asize, uint64_t *ashift)
}
*asize = MIN(*asize - 1, cvd->vdev_asize - 1) + 1;
}
*asize = MIN(*asize - 1, cvd->vdev_asize - 1) + 1;
+ *max_asize = MIN(*max_asize - 1, cvd->vdev_max_asize - 1) + 1;
*ashift = MAX(*ashift, cvd->vdev_ashift);
}
*ashift = MAX(*ashift, cvd->vdev_ashift);
}