From: Giuseppe Di Natale <dinatale2@llnl.gov>
Date: Mon, 14 Aug 2017 16:51:52 +0000 (-0700)
Subject: LU-6160 osd-zfs: Fix refcount_add call
X-Git-Tag: 2.11.53~69
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=ad7e62cc15e9e90d33a7302308d47566e4af3593;p=fs%2Flustre-release.git

LU-6160 osd-zfs: Fix refcount_add call

Correct the refcount_add in osd-zfs module's osd_fix_new_dnode
function. The variable 'tag' was undefined and caused osd-zfs
to fail builds against zfs packages with debug enabled.

This small change should enable lustre to be built against
zfs packages that have debug enabled.

Test-Parameters: trivial
Signed-off-by: Giuseppe Di Natale <dinatale2@llnl.gov>
Change-Id: If95f0af6178cf0ea78724658edfaece1ee16a3f1
Reviewed-on: https://review.whamcloud.com/28544
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
---

diff --git a/lustre/osd-zfs/osd_object.c b/lustre/osd-zfs/osd_object.c
index 06f1407..6d8c3dd 100644
--- a/lustre/osd-zfs/osd_object.c
+++ b/lustre/osd-zfs/osd_object.c
@@ -1640,7 +1640,7 @@ int osd_find_new_dnode(const struct lu_env *env, dmu_tx_t *tx,
 		LASSERT(dn->dn_handle);
 		DB_DNODE_ENTER(db);
 		if (refcount_add(&db->db_holds, osd_obj_tag) == 1) {
-			refcount_add(&dn->dn_holds, tag);
+			refcount_add(&dn->dn_holds, osd_obj_tag);
 			atomic_inc_32(&dn->dn_dbufs_count);
 		}
 		*dnp = dn;