Whamcloud - gitweb
LU-8561 osd-zfs: make smatch happy 45/22245/2
authorJinshan Xiong <jinshan.xiong@intel.com>
Wed, 31 Aug 2016 04:44:50 +0000 (21:44 -0700)
committerOleg Drokin <oleg.drokin@intel.com>
Wed, 5 Oct 2016 03:51:33 +0000 (03:51 +0000)
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>
lustre/osd-zfs/osd_handler.c

index d0efb85..f3da6b7 100644 (file)
@@ -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;
        }