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
Call zvol_create_minors() in spa_open_common() when initializing pool
[zfs.git]
/
module
/
zfs
/
dmu_tx.c
diff --git
a/module/zfs/dmu_tx.c
b/module/zfs/dmu_tx.c
index
e47d858
..
31c88c9
100644
(file)
--- a/
module/zfs/dmu_tx.c
+++ b/
module/zfs/dmu_tx.c
@@
-21,7
+21,7
@@
/*
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright 2011 Nexenta Systems, Inc. All rights reserved.
/*
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright 2011 Nexenta Systems, Inc. All rights reserved.
- * Copyright (c) 201
2
by Delphix. All rights reserved.
+ * Copyright (c) 201
3
by Delphix. All rights reserved.
*/
#include <sys/dmu.h>
*/
#include <sys/dmu.h>
@@
-301,6
+301,7
@@
dmu_tx_count_write(dmu_tx_hold_t *txh, uint64_t off, uint64_t len)
delta = P2NPHASE(off, dn->dn_datablksz);
}
delta = P2NPHASE(off, dn->dn_datablksz);
}
+ min_ibs = max_ibs = dn->dn_indblkshift;
if (dn->dn_maxblkid > 0) {
/*
* The blocksize can't change,
if (dn->dn_maxblkid > 0) {
/*
* The blocksize can't change,
@@
-308,13
+309,6
@@
dmu_tx_count_write(dmu_tx_hold_t *txh, uint64_t off, uint64_t len)
*/
ASSERT(dn->dn_datablkshift != 0);
min_bs = max_bs = dn->dn_datablkshift;
*/
ASSERT(dn->dn_datablkshift != 0);
min_bs = max_bs = dn->dn_datablkshift;
- min_ibs = max_ibs = dn->dn_indblkshift;
- } else if (dn->dn_indblkshift > max_ibs) {
- /*
- * This ensures that if we reduce DN_MAX_INDBLKSHIFT,
- * the code will still work correctly on older pools.
- */
- min_ibs = max_ibs = dn->dn_indblkshift;
}
/*
}
/*
@@
-929,7
+923,7
@@
dmu_tx_try_assign(dmu_tx_t *tx, uint64_t txg_how)
uint64_t memory, asize, fsize, usize;
uint64_t towrite, tofree, tooverwrite, tounref, tohold, fudge;
uint64_t memory, asize, fsize, usize;
uint64_t towrite, tofree, tooverwrite, tounref, tohold, fudge;
- ASSERT
3U(tx->tx_txg, ==, 0
);
+ ASSERT
0(tx->tx_txg
);
if (tx->tx_err) {
DMU_TX_STAT_BUMP(dmu_tx_error);
if (tx->tx_err) {
DMU_TX_STAT_BUMP(dmu_tx_error);