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 #3422, #3425
[zfs.git]
/
module
/
zfs
/
vdev_file.c
diff --git
a/module/zfs/vdev_file.c
b/module/zfs/vdev_file.c
index
25d0bad
..
3c0ce53
100644
(file)
--- a/
module/zfs/vdev_file.c
+++ b/
module/zfs/vdev_file.c
@@
-20,6
+20,7
@@
*/
/*
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012 by Delphix. All rights reserved.
*/
#include <sys/zfs_context.h>
*/
#include <sys/zfs_context.h>
@@
-47,7
+48,8
@@
vdev_file_rele(vdev_t *vd)
}
static int
}
static int
-vdev_file_open(vdev_t *vd, uint64_t *psize, uint64_t *ashift)
+vdev_file_open(vdev_t *vd, uint64_t *psize, uint64_t *max_psize,
+ uint64_t *ashift)
{
vdev_file_t *vf;
vnode_t *vp;
{
vdev_file_t *vf;
vnode_t *vp;
@@
-112,7
+114,7
@@
skip_open:
return (error);
}
return (error);
}
- *psize = vattr.va_size;
+ *
max_psize = *
psize = vattr.va_size;
*ashift = SPA_MINBLOCKSHIFT;
return (0);
*ashift = SPA_MINBLOCKSHIFT;
return (0);