diff options
| author | Brian Behlendorf <[email protected]> | 2008-12-18 11:51:22 -0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2008-12-18 11:51:22 -0800 |
| commit | 458a2444c2e1b50a72a5301c41193f930f6d3f34 (patch) | |
| tree | c35b9245e48c17d3f0d330f8f82e6f3481e6c3ee | |
| parent | 22f122e505a26346039b7432229175b77dd0cc83 (diff) | |
| parent | d957a6c66f98bb35f081f4635966b6f180a3bfe8 (diff) | |
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
| -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 2a089a4d3..b18db8540 100644 --- a/module/zfs/dnode.c +++ b/module/zfs/dnode.c @@ -612,10 +612,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); |