]> granicus.if.org Git - zfs/commitdiff
Resolve dnp shadow conflict
authorBrian Behlendorf <behlendorf1@llnl.gov>
Thu, 18 Dec 2008 19:49:22 +0000 (11:49 -0800)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Thu, 18 Dec 2008 19:49:22 +0000 (11:49 -0800)
module/zfs/dnode.c

index e77834d60dcc3d3615f7e68ddf1032f094905116..aa58b2f73ac1dafe2900c7439e83dec8c609c95e 100644 (file)
@@ -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);