From: Jinshan Xiong <jinshan.xiong@intel.com>
Date: Wed, 31 Aug 2016 04:44:50 +0000 (-0700)
Subject: LU-8561 osd-zfs: make smatch happy
X-Git-Tag: 2.8.59~4
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=refs%2Fchanges%2F45%2F22245%2F2;p=fs%2Flustre-release.git

LU-8561 osd-zfs: make smatch happy

By removing the check of null pointer and call dmu_objset_disown()
directly.

Signed-off-by: Jinshan Xiong <jinshan.xiong@intel.com>
Change-Id: I3e6e684968946a923ec4b1a59ea881145f3bdede
Reviewed-on: http://review.whamcloud.com/22245
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: John L. Hammond <john.hammond@intel.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
---

diff --git a/lustre/osd-zfs/osd_handler.c b/lustre/osd-zfs/osd_handler.c
index d0efb85..f3da6b76 100644
--- a/lustre/osd-zfs/osd_handler.c
+++ b/lustre/osd-zfs/osd_handler.c
@@ -1029,8 +1029,7 @@ static int osd_mount(const struct lu_env *env,
 	osd_unlinked_drain(env, o);
 err:
 	if (rc) {
-		if (o->od_os)
-			dmu_objset_disown(o->od_os, o);
+		dmu_objset_disown(o->od_os, o);
 		o->od_os = NULL;
 	}