diff options
| author | Brian Behlendorf <[email protected]> | 2008-12-18 11:49:22 -0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2008-12-18 11:49:22 -0800 |
| commit | d957a6c66f98bb35f081f4635966b6f180a3bfe8 (patch) | |
| tree | ae587bb3b7c3875f96e79d6c397be4daeb125a20 /module/zfs/dnode.c | |
| parent | 50b70a0c9a00bf0fb5dce249b327a7e908d93904 (diff) | |
Resolve dnp shadow conflict
Diffstat (limited to 'module/zfs/dnode.c')
| -rw-r--r-- | module/zfs/dnode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/module/zfs/dnode.c b/module/zfs/dnode.c index e77834d60..aa58b2f73 100644 --- a/module/zfs/dnode.c +++ b/module/zfs/dnode.c @@ -609,10 +609,10 @@ dnode_hold_impl(objset_impl_t *os, uint64_t object, int flag, } if ((dn = children_dnodes[idx]) == NULL) { - dnode_phys_t *dnp = (dnode_phys_t *)db->db.db_data+idx; + dnode_phys_t *dnpp = (dnode_phys_t *)db->db.db_data+idx; dnode_t *winner; - dn = dnode_create(os, dnp, db, object); + dn = dnode_create(os, dnpp, db, object); winner = atomic_cas_ptr(&children_dnodes[idx], NULL, dn); if (winner != NULL) { dnode_destroy(dn); |