Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-6068 misc: update old URLs to hpdd.intel.com
[fs/lustre-release.git]
/
lustre
/
ofd
/
ofd_dev.c
diff --git
a/lustre/ofd/ofd_dev.c
b/lustre/ofd/ofd_dev.c
index
874e991
..
a210a78
100644
(file)
--- a/
lustre/ofd/ofd_dev.c
+++ b/
lustre/ofd/ofd_dev.c
@@
-899,7
+899,6
@@
static int ofd_set_info_hdl(struct tgt_session_info *tsi)
void *key, *val = NULL;
int keylen, vallen, rc = 0;
bool is_grant_shrink;
void *key, *val = NULL;
int keylen, vallen, rc = 0;
bool is_grant_shrink;
- struct ofd_device *ofd = ofd_exp(tsi->tsi_exp);
ENTRY;
ENTRY;
@@
-942,8
+941,6
@@
static int ofd_set_info_hdl(struct tgt_session_info *tsi)
if (vallen > 0)
obd_export_evict_by_nid(tsi->tsi_exp->exp_obd, val);
rc = 0;
if (vallen > 0)
obd_export_evict_by_nid(tsi->tsi_exp->exp_obd, val);
rc = 0;
- } else if (KEY_IS(KEY_CAPA_KEY)) {
- rc = ofd_update_capa_key(ofd, val);
} else if (KEY_IS(KEY_SPTLRPC_CONF)) {
rc = tgt_adapt_sptlrpc_conf(tsi->tsi_tgt, 0);
} else {
} else if (KEY_IS(KEY_SPTLRPC_CONF)) {
rc = tgt_adapt_sptlrpc_conf(tsi->tsi_tgt, 0);
} else {
@@
-2124,11
+2121,6
@@
static int ofd_quotactl(struct tgt_session_info *tsi)
if (repoqc == NULL)
RETURN(err_serious(-ENOMEM));
if (repoqc == NULL)
RETURN(err_serious(-ENOMEM));
- /* report success for quota on/off for interoperability with current MDT
- * stack */
- if (oqctl->qc_cmd == Q_QUOTAON || oqctl->qc_cmd == Q_QUOTAOFF)
- RETURN(0);
-
*repoqc = *oqctl;
id = repoqc->qc_id;
*repoqc = *oqctl;
id = repoqc->qc_id;
@@
-2757,12
+2749,6
@@
static int ofd_init0(const struct lu_env *env, struct ofd_device *m,
spin_lock_init(&m->ofd_batch_lock);
init_rwsem(&m->ofd_lastid_rwsem);
spin_lock_init(&m->ofd_batch_lock);
init_rwsem(&m->ofd_lastid_rwsem);
- obd->u.filter.fo_fl_oss_capa = 0;
- INIT_LIST_HEAD(&obd->u.filter.fo_capa_keys);
- obd->u.filter.fo_capa_hash = init_capa_hash();
- if (obd->u.filter.fo_capa_hash == NULL)
- RETURN(-ENOMEM);
-
m->ofd_dt_dev.dd_lu_dev.ld_ops = &ofd_lu_ops;
m->ofd_dt_dev.dd_lu_dev.ld_obd = obd;
/* set this lu_device to obd, because error handling need it */
m->ofd_dt_dev.dd_lu_dev.ld_ops = &ofd_lu_ops;
m->ofd_dt_dev.dd_lu_dev.ld_obd = obd;
/* set this lu_device to obd, because error handling need it */
@@
-2902,9
+2888,6
@@
static void ofd_fini(const struct lu_env *env, struct ofd_device *m)
lfsck_degister(env, m->ofd_osd);
ofd_fs_cleanup(env, m);
lfsck_degister(env, m->ofd_osd);
ofd_fs_cleanup(env, m);
- ofd_free_capa_keys(m);
- cleanup_capa_hash(obd->u.filter.fo_capa_hash);
-
if (m->ofd_namespace != NULL) {
ldlm_namespace_free(m->ofd_namespace, NULL,
d->ld_obd->obd_force);
if (m->ofd_namespace != NULL) {
ldlm_namespace_free(m->ofd_namespace, NULL,
d->ld_obd->obd_force);
@@
-3056,7
+3039,7
@@
static void __exit ofd_exit(void)
class_unregister_type(LUSTRE_OST_NAME);
}
class_unregister_type(LUSTRE_OST_NAME);
}
-MODULE_AUTHOR("
Whamcloud, Inc. <http://www.whamcloud
.com/>");
+MODULE_AUTHOR("
Intel Corporation. <https://www.hpdd.intel
.com/>");
MODULE_DESCRIPTION("Lustre Object Filtering Device");
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("Lustre Object Filtering Device");
MODULE_LICENSE("GPL");