Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions

This commit is contained in:
Brian Behlendorf 2008-12-18 11:52:48 -08:00
parent 3d73450050 4be8cdca38
commit 054cf705be
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
module/zfs/dnode.c
View File

@ -614,10 +614,10 @@ dnode_hold_impl(objset_impl_t *os, uint64_t object, int flag,
} }
if ((dn = children_dnodes[idx]) == NULL) { 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; 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); winner = atomic_cas_ptr(&children_dnodes[idx], NULL, dn);
if (winner != NULL) { if (winner != NULL) {
dnode_destroy(dn); dnode_destroy(dn);