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
Disable zfs /etc/mtab updates
[zfs.git]
/
module
/
zfs
/
dnode.c
diff --git
a/module/zfs/dnode.c
b/module/zfs/dnode.c
index
f26aef2
..
9889c3c
100644
(file)
--- a/
module/zfs/dnode.c
+++ b/
module/zfs/dnode.c
@@
-52,12
+52,14
@@
static kmem_cache_t *dnode_cache;
#define DNODE_STAT_ADD(stat) /* nothing */
#endif /* DNODE_STATS */
#define DNODE_STAT_ADD(stat) /* nothing */
#endif /* DNODE_STATS */
-
static dnode_phys_t dnode_phys_zero
;
+
ASSERTV(static dnode_phys_t dnode_phys_zero)
;
int zfs_default_bs = SPA_MINBLOCKSHIFT;
int zfs_default_ibs = DN_MAX_INDBLKSHIFT;
int zfs_default_bs = SPA_MINBLOCKSHIFT;
int zfs_default_ibs = DN_MAX_INDBLKSHIFT;
+#ifdef _KERNEL
static kmem_cbrc_t dnode_move(void *, void *, size_t, void *);
static kmem_cbrc_t dnode_move(void *, void *, size_t, void *);
+#endif /* _KERNEL */
/* ARGSUSED */
static int
/* ARGSUSED */
static int
@@
-625,6
+627,7
@@
dnode_reallocate(dnode_t *dn, dmu_object_type_t ot, int blocksize,
mutex_exit(&dn->dn_mtx);
}
mutex_exit(&dn->dn_mtx);
}
+#ifdef _KERNEL
#ifdef DNODE_STATS
static struct {
uint64_t dms_dnode_invalid;
#ifdef DNODE_STATS
static struct {
uint64_t dms_dnode_invalid;
@@
-775,7
+778,6
@@
dnode_move_impl(dnode_t *odn, dnode_t *ndn)
odn->dn_moved = (uint8_t)-1;
}
odn->dn_moved = (uint8_t)-1;
}
-#ifdef _KERNEL
/*ARGSUSED*/
static kmem_cbrc_t
dnode_move(void *buf, void *newbuf, size_t size, void *arg)
/*ARGSUSED*/
static kmem_cbrc_t
dnode_move(void *buf, void *newbuf, size_t size, void *arg)
@@
-1072,7
+1074,8
@@
dnode_hold_impl(objset_t *os, uint64_t object, int flag,
int i;
dnode_children_t *winner;
children_dnodes = kmem_alloc(sizeof (dnode_children_t) +
int i;
dnode_children_t *winner;
children_dnodes = kmem_alloc(sizeof (dnode_children_t) +
- (epb - 1) * sizeof (dnode_handle_t), KM_SLEEP);
+ (epb - 1) * sizeof (dnode_handle_t),
+ KM_PUSHPAGE | KM_NODEBUG);
children_dnodes->dnc_count = epb;
dnh = &children_dnodes->dnc_children[0];
for (i = 0; i < epb; i++) {
children_dnodes->dnc_count = epb;
dnh = &children_dnodes->dnc_children[0];
for (i = 0; i < epb; i++) {