X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fosd-zfs%2Fosd_handler.c;h=bcb8705d7ab7a82af62e3716052c79568d21e394;hp=47a8e82fc9498b8a6836ec6795c991e1df4876ad;hb=c1d70a48899a5af92ebb10bacab1d9593930c441;hpb=fa14bdf6b648d1d4023a4fa88789059d185f4a07

diff --git a/lustre/osd-zfs/osd_handler.c b/lustre/osd-zfs/osd_handler.c
index 47a8e82..bcb8705 100644
--- a/lustre/osd-zfs/osd_handler.c
+++ b/lustre/osd-zfs/osd_handler.c
@@ -96,6 +96,8 @@ static void arc_prune_func(int64_t bytes, void *private)
 	struct lu_env      env;
 	int rc;
 
+	LASSERT(site->ls_obj_hash);
+
 	rc = lu_env_init(&env, LCT_SHRINKER);
 	if (rc) {
 		CERROR("%s: can't initialize shrinker env: rc = %d\n",
@@ -1051,10 +1053,6 @@ static int osd_mount(const struct lu_env *env,
 	o->od_xattr_in_sa = B_TRUE;
 	o->od_max_blksz = osd_spa_maxblocksize(o->od_os->os_spa);
 
-	rc = osd_objset_register_callbacks(o);
-	if (rc)
-		GOTO(err, rc);
-
 	rc = __osd_obj2dnode(o->od_os, o->od_rootid, &rootdn);
 	if (rc)
 		GOTO(err, rc);
@@ -1085,6 +1083,10 @@ static int osd_mount(const struct lu_env *env,
 	if (rc)
 		GOTO(err, rc);
 
+	rc = osd_objset_register_callbacks(o);
+	if (rc)
+		GOTO(err, rc);
+
 	rc = osd_procfs_init(o, o->od_svname);
 	if (rc)
 		GOTO(err, rc);