From: Alex Zhuravlev <alexey.zhuravlev@intel.com>
Date: Tue, 21 Jul 2015 18:20:07 +0000 (+0300)
Subject: LU-7893 osd-zfs: fix error handling in osd_mount()
X-Git-Tag: 2.8.55~9
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=0704fcd0e620e66743be1010c8eb1faed4d206d0

LU-7893 osd-zfs: fix error handling in osd_mount()

Do not try to release objectset if we failed to open it.

Change-Id: I85926d0b0a7fb5faf832a3907eac2324e7e6c07f
Signed-off-by: Alex Zhuravlev <alexey.zhuravlev@intel.com>
Reviewed-on: http://review.whamcloud.com/15671
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: Nathaniel Clark <nathaniel.l.clark@intel.com>
---

diff --git a/lustre/osd-zfs/osd_handler.c b/lustre/osd-zfs/osd_handler.c
index 334310d..5d1ae30 100644
--- a/lustre/osd-zfs/osd_handler.c
+++ b/lustre/osd-zfs/osd_handler.c
@@ -817,6 +817,7 @@ static int osd_objset_open(struct osd_device *o)
 
 	rc = -dmu_objset_own(o->od_mntdev, DMU_OST_ZFS, B_FALSE, o, &o->od_os);
 	if (rc) {
+		CERROR("%s: can't open %s\n", o->od_svname, o->od_mntdev);
 		o->od_os = NULL;
 		goto out;
 	}
@@ -973,7 +974,7 @@ static int osd_mount(const struct lu_env *env,
 
 	rc = osd_objset_open(o);
 	if (rc)
-		GOTO(err, rc);
+		RETURN(rc);
 
 	o->od_xattr_in_sa = B_TRUE;
 	o->od_max_blksz = SPA_OLD_MAXBLOCKSIZE;