* Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2011, 2014, Intel Corporation.
+ * Copyright (c) 2011, 2015, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
* future).
*
*/
+#define DEBUG_SUBSYSTEM S_LLITE
#include <obd_class.h>
#include <obd_support.h>
#include <obd.h>
int result;
ENTRY;
- if (!strcmp(watched->obd_type->typ_name, LUSTRE_OSC_NAME)) {
+ if (!strcmp(watched->obd_type->typ_name, LUSTRE_OSC_NAME) &&
+ watched->obd_set_up && !watched->obd_stopping) {
cli = &watched->u.cli;
lco = owner;
flags = cli->cl_import->imp_connect_data.ocd_connect_flags;
mutex_unlock(&lco->lco_lock);
result = 0;
} else {
- CERROR("unexpected notification from %s %s!\n",
- watched->obd_type->typ_name,
- watched->obd_name);
- result = -EINVAL;
+ CERROR("unexpected notification from %s %s"
+ "(setup:%d,stopping:%d)!\n",
+ watched->obd_type->typ_name,
+ watched->obd_name, watched->obd_set_up,
+ watched->obd_stopping);
+ result = -EINVAL;
}
RETURN(result);
}
struct cl_lock *lock;
struct cl_lock_descr *descr;
__u32 enqflags;
- int refcheck;
+ __u16 refcheck;
int rc;
env = cl_env_get(&refcheck);
io = vvp_env_thread_io(env);
io->ci_obj = obj;
- io->ci_ignore_layout = 1;
rc = cl_io_init(env, io, CIT_MISC, io->ci_obj);
if (rc != 0) {
return rc;
}
- lg->lg_env = cl_env_get(&refcheck);
+ lg->lg_env = env;
lg->lg_io = io;
lg->lg_lock = lock;
lg->lg_gid = gid;
- LASSERT(lg->lg_env == env);
- cl_env_unplant(env, &refcheck);
return 0;
}
struct lu_env *env = lg->lg_env;
struct cl_io *io = lg->lg_io;
struct cl_lock *lock = lg->lg_lock;
- int refcheck;
LASSERT(lg->lg_env != NULL);
LASSERT(lg->lg_gid != 0);
- cl_env_implant(env, &refcheck);
- cl_env_put(env, &refcheck);
-
cl_lock_release(env, lock);
cl_io_fini(env, io);
cl_env_put(env, NULL);