*
* You should have received a copy of the GNU General Public License
* version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
*
* GPL HEADER END
*/
* Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2011, 2015, Intel Corporation.
+ * Copyright (c) 2011, 2017, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
#define DEBUG_SUBSYSTEM S_LOV
#include <libcfs/libcfs.h>
-#include <lustre/lustre_idl.h>
-
#include <cl_object.h>
#include <lustre_dlm.h>
#include <lustre_fid.h>
-#include <lustre_ioctl.h>
+#include <uapi/linux/lustre/lustre_ioctl.h>
#include <lustre_lib.h>
#include <lustre_mds.h>
#include <lustre_net.h>
-#include <lustre_param.h>
+#include <uapi/linux/lustre/lustre_param.h>
#include <lustre_swab.h>
#include <lprocfs_status.h>
#include <obd_class.h>
/* Keep a refcount of lov->tgt usage to prevent racing with addition/deletion.
Any function that expects lov_tgts to remain stationary must take a ref. */
-static void lov_getref(struct obd_device *obd)
+void lov_tgts_getref(struct obd_device *obd)
{
struct lov_obd *lov = &obd->u.lov;
mutex_lock(&lov->lov_lock);
atomic_inc(&lov->lov_refcount);
mutex_unlock(&lov->lov_lock);
- return;
}
static void __lov_del_obd(struct obd_device *obd, struct lov_tgt_desc *tgt);
-static void lov_putref(struct obd_device *obd)
+void lov_tgts_putref(struct obd_device *obd)
{
struct lov_obd *lov = &obd->u.lov;
mutex_lock(&lov->lov_lock);
/* ok to dec to 0 more than once -- ltd_exp's will be null */
if (atomic_dec_and_test(&lov->lov_refcount) && lov->lov_death_row) {
- struct list_head kill = LIST_HEAD_INIT(kill);
+ LIST_HEAD(kill);
struct lov_tgt_desc *tgt, *n;
int i;
/* XXX - right now there is a dependency on ld_tgt_count
* being the maximum tgt index for computing the
* mds_max_easize. So we can't shrink it. */
- lov_ost_pool_remove(&lov->lov_packed, i);
+ tgt_pool_remove(&lov->lov_packed, i);
lov->lov_tgts[i] = NULL;
lov->lov_death_row--;
}
list_for_each_entry_safe(tgt, n, &kill, ltd_kill) {
list_del(&tgt->ltd_kill);
- /* Disconnect */
- __lov_del_obd(obd, tgt);
- }
- } else {
+ /* Disconnect */
+ __lov_del_obd(obd, tgt);
+ }
+ } else {
mutex_unlock(&lov->lov_lock);
- }
+ }
}
-static int lov_set_osc_active(struct obd_device *obd, struct obd_uuid *uuid,
- enum obd_notify_event ev);
static int lov_notify(struct obd_device *obd, struct obd_device *watched,
- enum obd_notify_event ev, void *data);
+ enum obd_notify_event ev);
-int lov_connect_obd(struct obd_device *obd, __u32 index, int activate,
- struct obd_connect_data *data)
+int lov_connect_osc(struct obd_device *obd, u32 index, int activate,
+ struct obd_connect_data *data)
{
struct lov_obd *lov = &obd->u.lov;
struct obd_uuid *tgt_uuid;
*/
imp = tgt_obd->u.cli.cl_import;
- if (activate) {
- tgt_obd->obd_no_recov = 0;
- /* FIXME this is probably supposed to be
- ptlrpc_set_import_active. Horrible naming. */
- ptlrpc_activate_import(imp);
- }
+ if (activate) {
+ tgt_obd->obd_no_recov = 0;
+ /* FIXME this is probably supposed to be
+ ptlrpc_set_import_active. Horrible naming. */
+ ptlrpc_activate_import(imp, false);
+ }
rc = obd_register_observer(tgt_obd, obd);
if (rc) {
RETURN(rc);
}
+ if (imp->imp_invalid) {
+ CDEBUG(D_CONFIG, "%s: not connecting - administratively disabled\n",
+ obd_uuid2str(tgt_uuid));
+ RETURN(0);
+ }
- if (imp->imp_invalid) {
- CDEBUG(D_CONFIG, "not connecting OSC %s; administratively "
- "disabled\n", obd_uuid2str(tgt_uuid));
- RETURN(0);
- }
-
- rc = obd_connect(NULL, &lov->lov_tgts[index]->ltd_exp, tgt_obd,
- &lov_osc_uuid, data, NULL);
+ rc = obd_connect(NULL, &lov->lov_tgts[index]->ltd_exp, tgt_obd,
+ &lov_osc_uuid, data, lov->lov_cache);
if (rc || !lov->lov_tgts[index]->ltd_exp) {
CERROR("Target %s connect error %d\n",
obd_uuid2str(tgt_uuid), rc);
CDEBUG(D_CONFIG, "Connected tgt idx %d %s (%s) %sactive\n", index,
obd_uuid2str(tgt_uuid), tgt_obd->obd_name, activate ? "":"in");
- if (lov->targets_proc_entry != NULL) {
- struct proc_dir_entry *osc_symlink;
- struct obd_device *osc_obd;
-
- osc_obd = lov->lov_tgts[index]->ltd_exp->exp_obd;
-
- LASSERT(osc_obd != NULL);
- LASSERT(osc_obd->obd_magic == OBD_DEVICE_MAGIC);
- LASSERT(osc_obd->obd_type->typ_name != NULL);
-
- osc_symlink = lprocfs_add_symlink(osc_obd->obd_name,
- lov->targets_proc_entry,
- "../../../%s/%s",
- osc_obd->obd_type->typ_name,
- osc_obd->obd_name);
- if (osc_symlink == NULL) {
- CERROR("cannot register LOV target "
- "/proc/fs/lustre/%s/%s/target_obds/%s\n",
- obd->obd_type->typ_name, obd->obd_name,
- osc_obd->obd_name);
+ if (lov->lov_tgts_kobj) {
+ /* Even if we failed, that's ok */
+ rc = sysfs_create_link(lov->lov_tgts_kobj,
+ &tgt_obd->obd_kset.kobj,
+ tgt_obd->obd_name);
+ if (rc) {
+ CERROR("%s: can't register LOV target /sys/fs/lustre/%s/%s/target_obds/%s : rc = %d\n",
+ obd->obd_name, obd->obd_type->typ_name,
+ obd->obd_name,
+ lov->lov_tgts[index]->ltd_exp->exp_obd->obd_name,
+ rc);
}
}
RETURN(0);
if (data)
lov->lov_ocd = *data;
- lov->targets_proc_entry = lprocfs_register("target_obds",
- obd->obd_proc_entry,
- NULL, NULL);
- if (IS_ERR(lov->targets_proc_entry)) {
- CERROR("%s: cannot register "
- "/proc/fs/lustre/%s/%s/target_obds\n",
- obd->obd_name, obd->obd_type->typ_name, obd->obd_name);
- lov->targets_proc_entry = NULL;
+ lov_tgts_getref(obd);
+
+ if (localdata) {
+ lov->lov_cache = localdata;
+ cl_cache_incref(lov->lov_cache);
}
- obd_getref(obd);
- for (i = 0; i < lov->desc.ld_tgt_count; i++) {
- tgt = lov->lov_tgts[i];
- if (!tgt || obd_uuid_empty(&tgt->ltd_uuid))
- continue;
- /* Flags will be lowest common denominator */
- rc = lov_connect_obd(obd, i, tgt->ltd_activate, &lov->lov_ocd);
+ for (i = 0; i < lov->desc.ld_tgt_count; i++) {
+ tgt = lov->lov_tgts[i];
+ if (!tgt || obd_uuid_empty(&tgt->ltd_uuid))
+ continue;
+ /* Flags will be lowest common denominator */
+ rc = lov_connect_osc(obd, i, tgt->ltd_activate, &lov->lov_ocd);
if (rc) {
CERROR("%s: lov connect tgt %d failed: %d\n",
obd->obd_name, i, rc);
if (!lov->lov_tgts[i]->ltd_exp)
continue;
- rc = lov_notify(obd, lov->lov_tgts[i]->ltd_exp->exp_obd,
- OBD_NOTIFY_CONNECT, (void *)&i);
+ rc = lov_notify(obd, lov->lov_tgts[i]->ltd_exp->exp_obd,
+ OBD_NOTIFY_CONNECT);
if (rc) {
CERROR("%s error sending notify %d\n",
obd->obd_name, rc);
}
}
- obd_putref(obd);
- RETURN(0);
+ lov_tgts_putref(obd);
+
+ RETURN(0);
}
static int lov_disconnect_obd(struct obd_device *obd, struct lov_tgt_desc *tgt)
{
- struct lov_obd *lov = &obd->u.lov;
- struct obd_device *osc_obd;
- int rc;
- ENTRY;
+ struct lov_obd *lov = &obd->u.lov;
+ struct obd_device *osc_obd;
+ int rc;
+ ENTRY;
- osc_obd = class_exp2obd(tgt->ltd_exp);
- CDEBUG(D_CONFIG, "%s: disconnecting target %s\n",
- obd->obd_name, osc_obd->obd_name);
+ osc_obd = class_exp2obd(tgt->ltd_exp);
+ CDEBUG(D_CONFIG, "%s: disconnecting target %s\n", obd->obd_name,
+ osc_obd ? osc_obd->obd_name : "<no obd>");
- if (tgt->ltd_active) {
- tgt->ltd_active = 0;
- lov->desc.ld_active_tgt_count--;
- tgt->ltd_exp->exp_obd->obd_inactive = 1;
- }
+ if (tgt->ltd_active) {
+ tgt->ltd_active = 0;
+ lov->desc.ld_active_tgt_count--;
+ tgt->ltd_exp->exp_obd->obd_inactive = 1;
+ }
if (osc_obd) {
+ if (lov->lov_tgts_kobj)
+ sysfs_remove_link(lov->lov_tgts_kobj,
+ osc_obd->obd_name);
+
/* Pass it on to our clients.
* XXX This should be an argument to disconnect,
* XXX not a back-door flag on the OBD. Ah well.
osc_obd->obd_force = obd->obd_force;
osc_obd->obd_fail = obd->obd_fail;
osc_obd->obd_no_recov = obd->obd_no_recov;
-
- if (lov->targets_proc_entry != NULL)
- lprocfs_remove_proc_entry(osc_obd->obd_name,
- lov->targets_proc_entry);
}
- obd_register_observer(osc_obd, NULL);
+ obd_register_observer(osc_obd, NULL);
- rc = obd_disconnect(tgt->ltd_exp);
- if (rc) {
- CERROR("Target %s disconnect error %d\n",
- tgt->ltd_uuid.uuid, rc);
- rc = 0;
- }
+ rc = obd_disconnect(tgt->ltd_exp);
+ if (rc) {
+ CERROR("Target %s disconnect error %d\n",
+ tgt->ltd_uuid.uuid, rc);
+ rc = 0;
+ }
- tgt->ltd_exp = NULL;
- RETURN(0);
+ tgt->ltd_exp = NULL;
+ RETURN(0);
}
static int lov_disconnect(struct obd_export *exp)
{
- struct obd_device *obd = class_exp2obd(exp);
- struct lov_obd *lov = &obd->u.lov;
- int i, rc;
- ENTRY;
-
- if (!lov->lov_tgts)
- goto out;
-
- /* Only disconnect the underlying layers on the final disconnect. */
- lov->lov_connects--;
- if (lov->lov_connects != 0) {
- /* why should there be more than 1 connect? */
- CERROR("disconnect #%d\n", lov->lov_connects);
- goto out;
- }
+ struct obd_device *obd = class_exp2obd(exp);
+ struct lov_obd *lov = &obd->u.lov;
+ u32 index;
+ int rc;
- /* Let's hold another reference so lov_del_obd doesn't spin through
- putref every time */
- obd_getref(obd);
+ ENTRY;
+ if (!lov->lov_tgts)
+ goto out;
+
+ /* Only disconnect the underlying layers on the final disconnect. */
+ lov->lov_connects--;
+ if (lov->lov_connects != 0) {
+ /* why should there be more than 1 connect? */
+ CWARN("%s: unexpected disconnect #%d\n",
+ obd->obd_name, lov->lov_connects);
+ goto out;
+ }
- for (i = 0; i < lov->desc.ld_tgt_count; i++) {
- if (lov->lov_tgts[i] && lov->lov_tgts[i]->ltd_exp) {
- /* Disconnection is the last we know about an obd */
- lov_del_target(obd, i, NULL, lov->lov_tgts[i]->ltd_gen);
- }
- }
- obd_putref(obd);
+ /* hold another ref so lov_del_obd() doesn't spin in putref each time */
+ lov_tgts_getref(obd);
- if (lov->targets_proc_entry != NULL)
- lprocfs_remove(&lov->targets_proc_entry);
+ for (index = 0; index < lov->desc.ld_tgt_count; index++) {
+ if (lov->lov_tgts[index] && lov->lov_tgts[index]->ltd_exp) {
+ /* Disconnection is the last we know about an OBD */
+ lov_del_target(obd, index, NULL,
+ lov->lov_tgts[index]->ltd_gen);
+ }
+ }
+ lov_tgts_putref(obd);
out:
- rc = class_disconnect(exp); /* bz 9811 */
- RETURN(rc);
+ rc = class_disconnect(exp); /* bz 9811 */
+ RETURN(rc);
}
/* Error codes:
* any >= 0 : is log target index
*/
static int lov_set_osc_active(struct obd_device *obd, struct obd_uuid *uuid,
- enum obd_notify_event ev)
+ enum obd_notify_event ev)
{
- struct lov_obd *lov = &obd->u.lov;
- struct lov_tgt_desc *tgt;
- int index, activate, active;
- ENTRY;
+ struct lov_obd *lov = &obd->u.lov;
+ struct lov_tgt_desc *tgt;
+ int index;
+ bool activate, active;
+ ENTRY;
- CDEBUG(D_INFO, "Searching in lov %p for uuid %s event(%d)\n",
- lov, uuid->uuid, ev);
+ CDEBUG(D_INFO, "Searching in lov %p for uuid %s event(%d)\n",
+ lov, uuid->uuid, ev);
- obd_getref(obd);
+ lov_tgts_getref(obd);
for (index = 0; index < lov->desc.ld_tgt_count; index++) {
tgt = lov->lov_tgts[index];
- if (!tgt)
- continue;
+ if (tgt && obd_uuid_equals(uuid, &tgt->ltd_uuid))
+ break;
+ }
+
+ if (index == lov->desc.ld_tgt_count)
+ GOTO(out, index = -EINVAL);
+
+ if (ev == OBD_NOTIFY_DEACTIVATE || ev == OBD_NOTIFY_ACTIVATE) {
+ activate = (ev == OBD_NOTIFY_ACTIVATE);
+
/*
* LU-642, initially inactive OSC could miss the obd_connect,
* we make up for it here.
*/
- if (ev == OBD_NOTIFY_ACTIVATE && tgt->ltd_exp == NULL &&
- obd_uuid_equals(uuid, &tgt->ltd_uuid)) {
+ if (activate && !tgt->ltd_exp) {
+ int rc;
struct obd_uuid lov_osc_uuid = {"LOV_OSC_UUID"};
- obd_connect(NULL, &tgt->ltd_exp, tgt->ltd_obd,
- &lov_osc_uuid, &lov->lov_ocd, NULL);
+ rc = obd_connect(NULL, &tgt->ltd_exp, tgt->ltd_obd,
+ &lov_osc_uuid, &lov->lov_ocd,
+ lov->lov_cache);
+ if (rc || !tgt->ltd_exp)
+ GOTO(out, index = rc);
}
- if (!tgt->ltd_exp)
- continue;
-
- CDEBUG(D_INFO, "lov idx %d is %s conn %#llx\n",
- index, obd_uuid2str(&tgt->ltd_uuid),
- tgt->ltd_exp->exp_handle.h_cookie);
- if (obd_uuid_equals(uuid, &tgt->ltd_uuid))
- break;
- }
-
- if (index == lov->desc.ld_tgt_count)
- GOTO(out, index = -EINVAL);
-
- if (ev == OBD_NOTIFY_DEACTIVATE || ev == OBD_NOTIFY_ACTIVATE) {
- activate = (ev == OBD_NOTIFY_ACTIVATE) ? 1 : 0;
-
- if (lov->lov_tgts[index]->ltd_activate == activate) {
- CDEBUG(D_INFO, "OSC %s already %sactivate!\n",
- uuid->uuid, activate ? "" : "de");
- } else {
- lov->lov_tgts[index]->ltd_activate = activate;
- CDEBUG(D_CONFIG, "%sactivate OSC %s\n",
- activate ? "" : "de", obd_uuid2str(uuid));
- }
-
- } else if (ev == OBD_NOTIFY_INACTIVE || ev == OBD_NOTIFY_ACTIVE) {
- active = (ev == OBD_NOTIFY_ACTIVE) ? 1 : 0;
- if (lov->lov_tgts[index]->ltd_active == active) {
- CDEBUG(D_INFO, "OSC %s already %sactive!\n",
- uuid->uuid, active ? "" : "in");
- GOTO(out, index);
- } else {
- CDEBUG(D_CONFIG, "Marking OSC %s %sactive\n",
- obd_uuid2str(uuid), active ? "" : "in");
- }
+ if (lov->lov_tgts[index]->ltd_activate == activate) {
+ CDEBUG(D_INFO, "OSC %s already %sactivate!\n",
+ uuid->uuid, activate ? "" : "de");
+ } else {
+ lov->lov_tgts[index]->ltd_activate = activate;
+ CDEBUG(D_CONFIG, "%sactivate OSC %s\n",
+ activate ? "" : "de", obd_uuid2str(uuid));
+ }
+ } else if (ev == OBD_NOTIFY_INACTIVE || ev == OBD_NOTIFY_ACTIVE) {
+ active = (ev == OBD_NOTIFY_ACTIVE);
- lov->lov_tgts[index]->ltd_active = active;
- if (active) {
- lov->desc.ld_active_tgt_count++;
- lov->lov_tgts[index]->ltd_exp->exp_obd->obd_inactive = 0;
- } else {
- lov->desc.ld_active_tgt_count--;
- lov->lov_tgts[index]->ltd_exp->exp_obd->obd_inactive = 1;
- }
+ if (lov->lov_tgts[index]->ltd_active == active) {
+ CDEBUG(D_INFO, "OSC %s already %sactive!\n",
+ uuid->uuid, active ? "" : "in");
+ GOTO(out, index);
+ }
+ CDEBUG(D_CONFIG, "Marking OSC %s %sactive\n",
+ obd_uuid2str(uuid), active ? "" : "in");
+
+ lov->lov_tgts[index]->ltd_active = active;
+ if (active) {
+ lov->desc.ld_active_tgt_count++;
+ lov->lov_tgts[index]->ltd_exp->exp_obd->obd_inactive = 0;
+ } else {
+ lov->desc.ld_active_tgt_count--;
+ lov->lov_tgts[index]->ltd_exp->exp_obd->obd_inactive = 1;
+ }
} else {
CERROR("%s: unknown event %d for uuid %s\n", obd->obd_name,
ev, uuid->uuid);
}
+ if (tgt->ltd_exp)
+ CDEBUG(D_INFO, "%s: lov idx %d conn %llx\n", obd_uuid2str(uuid),
+ index, tgt->ltd_exp->exp_handle.h_cookie);
+
out:
- obd_putref(obd);
+ lov_tgts_putref(obd);
RETURN(index);
}
static int lov_notify(struct obd_device *obd, struct obd_device *watched,
- enum obd_notify_event ev, void *data)
+ enum obd_notify_event ev)
{
- int rc = 0;
+ int rc = 0;
struct lov_obd *lov = &obd->u.lov;
- ENTRY;
+ ENTRY;
down_read(&lov->lov_notify_lock);
- if (!lov->lov_connects) {
- up_read(&lov->lov_notify_lock);
- RETURN(rc);
- }
-
- if (ev == OBD_NOTIFY_ACTIVE || ev == OBD_NOTIFY_INACTIVE ||
- ev == OBD_NOTIFY_ACTIVATE || ev == OBD_NOTIFY_DEACTIVATE) {
- struct obd_uuid *uuid;
-
- LASSERT(watched);
+ if (!lov->lov_connects)
+ GOTO(out_notify_lock, rc = 0);
- if (strcmp(watched->obd_type->typ_name, LUSTRE_OSC_NAME)) {
- up_read(&lov->lov_notify_lock);
- CERROR("unexpected notification of %s %s!\n",
- watched->obd_type->typ_name,
- watched->obd_name);
- RETURN(-EINVAL);
- }
- uuid = &watched->u.cli.cl_target_uuid;
-
- /* Set OSC as active before notifying the observer, so the
- * observer can use the OSC normally.
- */
- rc = lov_set_osc_active(obd, uuid, ev);
- if (rc < 0) {
- up_read(&lov->lov_notify_lock);
- CERROR("event(%d) of %s failed: %d\n", ev,
- obd_uuid2str(uuid), rc);
- RETURN(rc);
- }
- /* active event should be pass lov target index as data */
- data = &rc;
- }
+ if (ev == OBD_NOTIFY_ACTIVE || ev == OBD_NOTIFY_INACTIVE ||
+ ev == OBD_NOTIFY_ACTIVATE || ev == OBD_NOTIFY_DEACTIVATE) {
+ struct obd_uuid *uuid;
- /* Pass the notification up the chain. */
- if (watched) {
- rc = obd_notify_observer(obd, watched, ev, data);
- } else {
- /* NULL watched means all osc's in the lov (only for syncs) */
- /* sync event should be send lov idx as data */
- struct lov_obd *lov = &obd->u.lov;
- int i, is_sync;
+ LASSERT(watched);
- data = &i;
- is_sync = (ev == OBD_NOTIFY_SYNC) ||
- (ev == OBD_NOTIFY_SYNC_NONBLOCK);
+ if (strcmp(watched->obd_type->typ_name, LUSTRE_OSC_NAME)) {
+ CERROR("unexpected notification of %s %s\n",
+ watched->obd_type->typ_name, watched->obd_name);
+ GOTO(out_notify_lock, rc = -EINVAL);
+ }
- obd_getref(obd);
- for (i = 0; i < lov->desc.ld_tgt_count; i++) {
- if (!lov->lov_tgts[i])
- continue;
+ uuid = &watched->u.cli.cl_target_uuid;
- /* don't send sync event if target not
- * connected/activated */
- if (is_sync && !lov->lov_tgts[i]->ltd_active)
- continue;
+ /* Set OSC as active before notifying the observer, so the
+ * observer can use the OSC normally.
+ */
+ rc = lov_set_osc_active(obd, uuid, ev);
+ if (rc < 0) {
+ CERROR("%s: event %d failed: rc = %d\n", obd->obd_name,
+ ev, rc);
+ GOTO(out_notify_lock, rc);
+ }
+ }
- rc = obd_notify_observer(obd, lov->lov_tgts[i]->ltd_obd,
- ev, data);
- if (rc) {
- CERROR("%s: notify %s of %s failed %d\n",
- obd->obd_name,
- obd->obd_observer->obd_name,
- lov->lov_tgts[i]->ltd_obd->obd_name,
- rc);
- }
- }
- obd_putref(obd);
- }
+ /* Pass the notification up the chain. */
+ rc = obd_notify_observer(obd, watched, ev);
+out_notify_lock:
up_read(&lov->lov_notify_lock);
- RETURN(rc);
+
+ RETURN(rc);
}
static int lov_add_target(struct obd_device *obd, struct obd_uuid *uuidp,
- __u32 index, int gen, int active)
+ u32 index, int gen, int active)
{
- struct lov_obd *lov = &obd->u.lov;
- struct lov_tgt_desc *tgt;
- struct obd_device *tgt_obd;
- int rc;
- ENTRY;
+ struct lov_obd *lov = &obd->u.lov;
+ struct lov_tgt_desc *tgt;
+ struct obd_device *tgt_obd;
+ int rc;
- CDEBUG(D_CONFIG, "uuid:%s idx:%d gen:%d active:%d\n",
- uuidp->uuid, index, gen, active);
+ ENTRY;
+ CDEBUG(D_CONFIG, "uuid:%s idx:%u gen:%d active:%d\n",
+ uuidp->uuid, index, gen, active);
- if (gen <= 0) {
- CERROR("request to add OBD %s with invalid generation: %d\n",
- uuidp->uuid, gen);
- RETURN(-EINVAL);
- }
+ if (gen <= 0) {
+ CERROR("%s: request to add '%s' with invalid generation: %d\n",
+ obd->obd_name, uuidp->uuid, gen);
+ RETURN(-EINVAL);
+ }
- tgt_obd = class_find_client_obd(uuidp, LUSTRE_OSC_NAME,
- &obd->obd_uuid);
- if (tgt_obd == NULL)
- RETURN(-EINVAL);
+ tgt_obd = class_find_client_obd(uuidp, LUSTRE_OSC_NAME, &obd->obd_uuid);
+ if (tgt_obd == NULL)
+ RETURN(-EINVAL);
mutex_lock(&lov->lov_lock);
- if ((index < lov->lov_tgt_size) && (lov->lov_tgts[index] != NULL)) {
- tgt = lov->lov_tgts[index];
- CERROR("UUID %s already assigned at LOV target index %d\n",
- obd_uuid2str(&tgt->ltd_uuid), index);
+ if ((index < lov->lov_tgt_size) && (lov->lov_tgts[index] != NULL)) {
+ tgt = lov->lov_tgts[index];
+ rc = -EEXIST;
+ CERROR("%s: UUID %s already assigned at index %d: rc = %d\n",
+ obd->obd_name, obd_uuid2str(&tgt->ltd_uuid), index, rc);
mutex_unlock(&lov->lov_lock);
- RETURN(-EEXIST);
- }
+ RETURN(rc);
+ }
- if (index >= lov->lov_tgt_size) {
- /* We need to reallocate the lov target array. */
- struct lov_tgt_desc **newtgts, **old = NULL;
- __u32 newsize, oldsize = 0;
+ if (index >= lov->lov_tgt_size) {
+ /* We need to reallocate the lov target array. */
+ struct lov_tgt_desc **newtgts, **old = NULL;
+ __u32 newsize, oldsize = 0;
- newsize = max(lov->lov_tgt_size, (__u32)2);
- while (newsize < index + 1)
- newsize = newsize << 1;
- OBD_ALLOC(newtgts, sizeof(*newtgts) * newsize);
- if (newtgts == NULL) {
+ newsize = max(lov->lov_tgt_size, 2U);
+ while (newsize < index + 1)
+ newsize = newsize << 1;
+ OBD_ALLOC_PTR_ARRAY(newtgts, newsize);
+ if (newtgts == NULL) {
mutex_unlock(&lov->lov_lock);
- RETURN(-ENOMEM);
- }
+ RETURN(-ENOMEM);
+ }
- if (lov->lov_tgt_size) {
- memcpy(newtgts, lov->lov_tgts, sizeof(*newtgts) *
- lov->lov_tgt_size);
- old = lov->lov_tgts;
- oldsize = lov->lov_tgt_size;
- }
+ if (lov->lov_tgt_size) {
+ memcpy(newtgts, lov->lov_tgts, sizeof(*newtgts) *
+ lov->lov_tgt_size);
+ old = lov->lov_tgts;
+ oldsize = lov->lov_tgt_size;
+ }
lov->lov_tgts = newtgts;
lov->lov_tgt_size = newsize;
smp_rmb();
if (old)
- OBD_FREE(old, sizeof(*old) * oldsize);
+ OBD_FREE_PTR_ARRAY(old, oldsize);
- CDEBUG(D_CONFIG, "tgts: %p size: %d\n",
- lov->lov_tgts, lov->lov_tgt_size);
- }
+ CDEBUG(D_CONFIG, "tgts: %p size: %d\n",
+ lov->lov_tgts, lov->lov_tgt_size);
+ }
OBD_ALLOC_PTR(tgt);
if (!tgt) {
RETURN(-ENOMEM);
}
- rc = lov_ost_pool_add(&lov->lov_packed, index, lov->lov_tgt_size);
+ rc = tgt_pool_add(&lov->lov_packed, index, lov->lov_tgt_size);
if (rc) {
mutex_unlock(&lov->lov_lock);
OBD_FREE_PTR(tgt);
CDEBUG(D_CONFIG, "idx=%d ltd_gen=%d ld_tgt_count=%d\n",
index, tgt->ltd_gen, lov->desc.ld_tgt_count);
- rc = obd_notify(obd, tgt_obd, OBD_NOTIFY_CREATE, &index);
-
- if (lov->lov_connects == 0) {
- /* lov_connect hasn't been called yet. We'll do the
- lov_connect_obd on this target when that fn first runs,
- because we don't know the connect flags yet. */
- RETURN(0);
- }
+ if (lov->lov_connects == 0) {
+ /* lov_connect hasn't been called yet. We'll do the
+ lov_connect_osc on this target when that fn first runs,
+ because we don't know the connect flags yet. */
+ RETURN(0);
+ }
- obd_getref(obd);
+ lov_tgts_getref(obd);
- rc = lov_connect_obd(obd, index, active, &lov->lov_ocd);
+ rc = lov_connect_osc(obd, index, active, &lov->lov_ocd);
if (rc)
GOTO(out, rc);
if (!tgt->ltd_exp)
GOTO(out, rc = 0);
- if (lov->lov_cache != NULL) {
- rc = obd_set_info_async(NULL, tgt->ltd_exp,
- sizeof(KEY_CACHE_SET), KEY_CACHE_SET,
- sizeof(struct cl_client_cache), lov->lov_cache,
- NULL);
- if (rc < 0)
- GOTO(out, rc);
- }
-
- rc = lov_notify(obd, tgt->ltd_exp->exp_obd,
- active ? OBD_NOTIFY_CONNECT : OBD_NOTIFY_INACTIVE,
- (void *)&index);
+ rc = lov_notify(obd, tgt->ltd_exp->exp_obd,
+ active ? OBD_NOTIFY_CONNECT : OBD_NOTIFY_INACTIVE);
out:
- if (rc) {
- CERROR("add failed (%d), deleting %s\n", rc,
- obd_uuid2str(&tgt->ltd_uuid));
+ if (rc) {
+ CERROR("%s: add failed, deleting %s: rc = %d\n",
+ obd->obd_name, obd_uuid2str(&tgt->ltd_uuid), rc);
lov_del_target(obd, index, NULL, 0);
- }
- obd_putref(obd);
- RETURN(rc);
+ }
+ lov_tgts_putref(obd);
+ RETURN(rc);
}
/* Schedule a target for deletion */
-int lov_del_target(struct obd_device *obd, __u32 index,
+int lov_del_target(struct obd_device *obd, u32 index,
struct obd_uuid *uuidp, int gen)
{
struct lov_obd *lov = &obd->u.lov;
/* to make sure there's no ongoing lov_notify() now */
down_write(&lov->lov_notify_lock);
- obd_getref(obd);
+ lov_tgts_getref(obd);
if (!lov->lov_tgts[index]) {
CERROR("LOV target at index %d is not setup.\n", index);
lov->lov_tgts[index]->ltd_reap = 1;
lov->lov_death_row++;
- /* we really delete it from obd_putref */
+ /* we really delete it from lov_tgts_putref() */
out:
- obd_putref(obd);
+ lov_tgts_putref(obd);
up_write(&lov->lov_notify_lock);
- RETURN(rc);
+ RETURN(rc);
}
static void __lov_del_obd(struct obd_device *obd, struct lov_tgt_desc *tgt)
void lov_fix_desc_pattern(__u32 *val)
{
/* from lov_setstripe */
- if ((*val != 0) && (*val != LOV_PATTERN_RAID0)) {
- LCONSOLE_WARN("Unknown stripe pattern: %#x\n", *val);
- *val = 0;
- }
+ if ((*val != 0) && !lov_pattern_supported_normal_comp(*val)) {
+ LCONSOLE_WARN("lov: Unknown stripe pattern: %#x\n", *val);
+ *val = 0;
+ }
}
void lov_fix_desc_qos_maxage(__u32 *val)
void lov_fix_desc(struct lov_desc *desc)
{
- lov_fix_desc_stripe_size(&desc->ld_default_stripe_size);
- lov_fix_desc_stripe_count(&desc->ld_default_stripe_count);
- lov_fix_desc_pattern(&desc->ld_pattern);
- lov_fix_desc_qos_maxage(&desc->ld_qos_maxage);
+ lov_fix_desc_stripe_size(&desc->ld_default_stripe_size);
+ lov_fix_desc_stripe_count(&desc->ld_default_stripe_count);
+ lov_fix_desc_pattern(&desc->ld_pattern);
+ lov_fix_desc_qos_maxage(&desc->ld_qos_maxage);
}
int lov_setup(struct obd_device *obd, struct lustre_cfg *lcfg)
{
struct lov_desc *desc;
struct lov_obd *lov = &obd->u.lov;
-#ifdef CONFIG_PROC_FS
- struct obd_type *type;
-#endif
int rc;
ENTRY;
init_rwsem(&lov->lov_notify_lock);
- lov->lov_pools_hash_body = cfs_hash_create("POOLS", HASH_POOLS_CUR_BITS,
- HASH_POOLS_MAX_BITS,
- HASH_POOLS_BKT_BITS, 0,
- CFS_HASH_MIN_THETA,
- CFS_HASH_MAX_THETA,
- &pool_hash_operations,
- CFS_HASH_DEFAULT);
INIT_LIST_HEAD(&lov->lov_pool_list);
lov->lov_pool_count = 0;
- rc = lov_ost_pool_init(&lov->lov_packed, 0);
+ rc = lov_pool_hash_init(&lov->lov_pools_hash_body);
+ if (rc)
+ GOTO(out, rc);
+
+ rc = tgt_pool_init(&lov->lov_packed, 0);
if (rc)
GOTO(out, rc);
-#ifdef CONFIG_PROC_FS
- obd->obd_vars = lprocfs_lov_obd_vars;
- /* If this is true then both client (lov) and server
- * (lod) are on the same node. The lod layer if loaded
- * first will register the lov proc directory. In that
- * case obd->obd_type->typ_procroot will be not set.
- * Instead we use type->typ_procsym as the parent. */
- type = class_search_type(LUSTRE_LOD_NAME);
- if (type != NULL && type->typ_procsym != NULL) {
- obd->obd_proc_entry = lprocfs_register(obd->obd_name,
- type->typ_procsym,
- obd->obd_vars, obd);
- if (IS_ERR(obd->obd_proc_entry)) {
- rc = PTR_ERR(obd->obd_proc_entry);
- CERROR("error %d setting up lprocfs for %s\n", rc,
- obd->obd_name);
- obd->obd_proc_entry = NULL;
- }
- } else {
- rc = lprocfs_obd_setup(obd);
- }
+ rc = lov_tunables_init(obd);
+ if (rc)
+ GOTO(out, rc);
- if (rc == 0) {
- rc = lprocfs_seq_create(obd->obd_proc_entry, "target_obd",
- 0444, &lov_proc_target_fops, obd);
- if (rc)
- CWARN("Error adding the target_obd file\n");
-
- lov->lov_pool_proc_entry = lprocfs_register("pools",
- obd->obd_proc_entry,
- NULL, NULL);
- if (IS_ERR(lov->lov_pool_proc_entry)) {
- rc = PTR_ERR(lov->lov_pool_proc_entry);
- CERROR("error %d setting up lprocfs for pools\n", rc);
- lov->lov_pool_proc_entry = NULL;
- }
- }
-#endif
- RETURN(0);
+ lov->lov_tgts_kobj = kobject_create_and_add("target_obds",
+ &obd->obd_kset.kobj);
out:
return rc;
struct pool_desc *pool;
ENTRY;
+ if (lov->lov_tgts_kobj) {
+ kobject_put(lov->lov_tgts_kobj);
+ lov->lov_tgts_kobj = NULL;
+ }
+
list_for_each_safe(pos, tmp, &lov->lov_pool_list) {
pool = list_entry(pos, struct pool_desc, pool_list);
/* free pool structs */
/* coverity[overrun-buffer-val] */
lov_pool_del(obd, pool->pool_name);
}
- cfs_hash_putref(lov->lov_pools_hash_body);
- lov_ost_pool_free(&lov->lov_packed);
+ lov_pool_hash_destroy(&lov->lov_pools_hash_body);
+ tgt_pool_free(&lov->lov_packed);
lprocfs_obd_cleanup(obd);
if (lov->lov_tgts) {
int i;
- obd_getref(obd);
+ lov_tgts_getref(obd);
for (i = 0; i < lov->desc.ld_tgt_count; i++) {
if (!lov->lov_tgts[i])
continue;
/* Inactive targets may never have connected */
- if (lov->lov_tgts[i]->ltd_active ||
- atomic_read(&lov->lov_refcount))
+ if (lov->lov_tgts[i]->ltd_active)
/* We should never get here - these
* should have been removed in the
* disconnect. */
atomic_read(&lov->lov_refcount));
lov_del_target(obd, i, NULL, 0);
}
- obd_putref(obd);
- OBD_FREE(lov->lov_tgts, sizeof(*lov->lov_tgts) *
- lov->lov_tgt_size);
- lov->lov_tgt_size = 0;
- }
+ lov_tgts_putref(obd);
+ OBD_FREE_PTR_ARRAY(lov->lov_tgts, lov->lov_tgt_size);
+ lov->lov_tgt_size = 0;
+ }
if (lov->lov_cache != NULL) {
cl_cache_decref(lov->lov_cache);
}
int lov_process_config_base(struct obd_device *obd, struct lustre_cfg *lcfg,
- __u32 *indexp, int *genp)
+ u32 *indexp, int *genp)
{
- struct obd_uuid obd_uuid;
- int cmd;
- int rc = 0;
- ENTRY;
+ struct obd_uuid obd_uuid;
+ int cmd;
+ int rc = 0;
- switch(cmd = lcfg->lcfg_command) {
- case LCFG_LOV_ADD_OBD:
- case LCFG_LOV_ADD_INA:
- case LCFG_LOV_DEL_OBD: {
- __u32 index;
- int gen;
- /* lov_modify_tgts add 0:lov_mdsA 1:ost1_UUID 2:0 3:1 */
- if (LUSTRE_CFG_BUFLEN(lcfg, 1) > sizeof(obd_uuid.uuid))
- GOTO(out, rc = -EINVAL);
-
- obd_str2uuid(&obd_uuid, lustre_cfg_buf(lcfg, 1));
-
- if (sscanf(lustre_cfg_buf(lcfg, 2), "%u", indexp) != 1)
- GOTO(out, rc = -EINVAL);
- if (sscanf(lustre_cfg_buf(lcfg, 3), "%d", genp) != 1)
- GOTO(out, rc = -EINVAL);
- index = *indexp;
- gen = *genp;
- if (cmd == LCFG_LOV_ADD_OBD)
- rc = lov_add_target(obd, &obd_uuid, index, gen, 1);
- else if (cmd == LCFG_LOV_ADD_INA)
- rc = lov_add_target(obd, &obd_uuid, index, gen, 0);
- else
- rc = lov_del_target(obd, index, &obd_uuid, gen);
- GOTO(out, rc);
- }
- case LCFG_PARAM: {
+ ENTRY;
+ switch (cmd = lcfg->lcfg_command) {
+ case LCFG_ADD_MDC:
+ case LCFG_DEL_MDC:
+ break;
+ case LCFG_LOV_ADD_OBD:
+ case LCFG_LOV_ADD_INA:
+ case LCFG_LOV_DEL_OBD: {
+ u32 index;
+ int gen;
+
+ /* lov_modify_tgts add 0:lov_mdsA 1:ost1_UUID 2:0 3:1 */
+ if (LUSTRE_CFG_BUFLEN(lcfg, 1) > sizeof(obd_uuid.uuid))
+ GOTO(out, rc = -EINVAL);
+
+ obd_str2uuid(&obd_uuid, lustre_cfg_buf(lcfg, 1));
+
+ rc = kstrtou32(lustre_cfg_buf(lcfg, 2), 10, indexp);
+ if (rc)
+ GOTO(out, rc);
+ rc = kstrtoint(lustre_cfg_buf(lcfg, 3), 10, genp);
+ if (rc)
+ GOTO(out, rc);
+ index = *indexp;
+ gen = *genp;
+ if (cmd == LCFG_LOV_ADD_OBD)
+ rc = lov_add_target(obd, &obd_uuid, index, gen, 1);
+ else if (cmd == LCFG_LOV_ADD_INA)
+ rc = lov_add_target(obd, &obd_uuid, index, gen, 0);
+ else
+ rc = lov_del_target(obd, index, &obd_uuid, gen);
+
+ GOTO(out, rc);
+ }
+ case LCFG_PARAM: {
struct lov_desc *desc = &(obd->u.lov.desc);
+ ssize_t count;
if (!desc)
GOTO(out, rc = -EINVAL);
- rc = class_process_proc_param(PARAM_LOV, obd->obd_vars,
- lcfg, obd);
- if (rc > 0)
- rc = 0;
- GOTO(out, rc);
+ count = class_modify_config(lcfg, PARAM_LOV,
+ &obd->obd_kset.kobj);
+ GOTO(out, rc = count < 0 ? count : 0);
}
case LCFG_POOL_NEW:
case LCFG_POOL_ADD:
RETURN(rc);
}
-static int
-lov_statfs_interpret(struct ptlrpc_request_set *rqset, void *data, int rc)
-{
- struct lov_request_set *lovset = (struct lov_request_set *)data;
- int err;
- ENTRY;
-
- if (rc)
- atomic_set(&lovset->set_completes, 0);
-
- err = lov_fini_statfs_set(lovset);
- RETURN(rc ? rc : err);
-}
-
-static int lov_statfs_async(struct obd_export *exp, struct obd_info *oinfo,
- __u64 max_age, struct ptlrpc_request_set *rqset)
-{
- struct obd_device *obd = class_exp2obd(exp);
- struct lov_request_set *set;
- struct lov_request *req;
- struct list_head *pos;
- struct lov_obd *lov;
- int rc = 0;
- ENTRY;
-
- LASSERT(oinfo != NULL);
- LASSERT(oinfo->oi_osfs != NULL);
-
- lov = &obd->u.lov;
- rc = lov_prep_statfs_set(obd, oinfo, &set);
- if (rc)
- RETURN(rc);
-
- list_for_each(pos, &set->set_list) {
- req = list_entry(pos, struct lov_request, rq_link);
- rc = obd_statfs_async(lov->lov_tgts[req->rq_idx]->ltd_exp,
- &req->rq_oi, max_age, rqset);
- if (rc)
- break;
- }
-
- if (rc || list_empty(&rqset->set_requests)) {
- int err;
- if (rc)
- atomic_set(&set->set_completes, 0);
- err = lov_fini_statfs_set(set);
- RETURN(rc ? rc : err);
- }
-
- LASSERT(rqset->set_interpret == NULL);
- rqset->set_interpret = lov_statfs_interpret;
- rqset->set_arg = (void *)set;
- RETURN(0);
-}
-
static int lov_statfs(const struct lu_env *env, struct obd_export *exp,
- struct obd_statfs *osfs, __u64 max_age, __u32 flags)
+ struct obd_statfs *osfs, time64_t max_age, __u32 flags)
{
- struct ptlrpc_request_set *set = NULL;
+ struct obd_device *obd = class_exp2obd(exp);
+ struct lov_obd *lov = &obd->u.lov;
struct obd_info oinfo = {
.oi_osfs = osfs,
.oi_flags = flags,
};
+ struct ptlrpc_request_set *rqset;
+ struct lov_request_set *set = NULL;
+ struct lov_request *req;
int rc = 0;
+ int rc2;
ENTRY;
- /* for obdclass we forbid using obd_statfs_rqset, but prefer using async
- * statfs requests */
- set = ptlrpc_prep_set();
- if (set == NULL)
+ rqset = ptlrpc_prep_set();
+ if (rqset == NULL)
RETURN(-ENOMEM);
- rc = lov_statfs_async(exp, &oinfo, max_age, set);
+ rc = lov_prep_statfs_set(obd, &oinfo, &set);
+ if (rc < 0)
+ GOTO(out_rqset, rc);
+
+ list_for_each_entry(req, &set->set_list, rq_link) {
+ rc = obd_statfs_async(lov->lov_tgts[req->rq_idx]->ltd_exp,
+ &req->rq_oi, max_age, rqset);
+ if (rc < 0)
+ GOTO(out_set, rc);
+ }
+
+ rc = ptlrpc_set_wait(env, rqset);
+
+out_set:
+ if (rc < 0)
+ atomic_set(&set->set_completes, 0);
+
+ rc2 = lov_fini_statfs_set(set);
if (rc == 0)
- rc = ptlrpc_set_wait(set);
+ rc = rc2;
- ptlrpc_set_destroy(set);
+out_rqset:
+ ptlrpc_set_destroy(rqset);
RETURN(rc);
}
static int lov_iocontrol(unsigned int cmd, struct obd_export *exp, int len,
void *karg, void __user *uarg)
{
- struct obd_device *obddev = class_exp2obd(exp);
- struct lov_obd *lov = &obddev->u.lov;
- int i = 0, rc = 0, count = lov->desc.ld_tgt_count;
- struct obd_uuid *uuidp;
- ENTRY;
+ struct obd_device *obd = class_exp2obd(exp);
+ struct lov_obd *lov = &obd->u.lov;
+ int i = 0, rc = 0, count = lov->desc.ld_tgt_count;
- switch (cmd) {
- case IOC_OBD_STATFS: {
- struct obd_ioctl_data *data = karg;
- struct obd_device *osc_obd;
- struct obd_statfs stat_buf = {0};
- __u32 index;
+ ENTRY;
+ switch (cmd) {
+ case IOC_OBD_STATFS: {
+ struct obd_ioctl_data *data = karg;
+ struct obd_device *osc_obd;
+ struct obd_statfs stat_buf = {0};
+ struct obd_import *imp;
+ __u32 index;
__u32 flags;
- memcpy(&index, data->ioc_inlbuf2, sizeof(index));
- if ((index >= count))
- RETURN(-ENODEV);
+ memcpy(&index, data->ioc_inlbuf2, sizeof(index));
+ if (index >= count)
+ RETURN(-ENODEV);
- if (!lov->lov_tgts[index])
- /* Try again with the next index */
- RETURN(-EAGAIN);
- if (!lov->lov_tgts[index]->ltd_active)
- RETURN(-ENODATA);
+ if (!lov->lov_tgts[index])
+ /* Try again with the next index */
+ RETURN(-EAGAIN);
- osc_obd = class_exp2obd(lov->lov_tgts[index]->ltd_exp);
- if (!osc_obd)
- RETURN(-EINVAL);
+ osc_obd = class_exp2obd(lov->lov_tgts[index]->ltd_exp);
+ if (!osc_obd)
+ RETURN(-EINVAL);
+
+ imp = osc_obd->u.cli.cl_import;
+ if (!lov->lov_tgts[index]->ltd_active &&
+ imp->imp_state != LUSTRE_IMP_IDLE)
+ RETURN(-ENODATA);
- /* copy UUID */
+ /* copy UUID */
if (copy_to_user(data->ioc_pbuf2, obd2cli_tgt(osc_obd),
min_t(unsigned long, data->ioc_plen2,
sizeof(struct obd_uuid))))
memcpy(&flags, data->ioc_inlbuf1, sizeof(flags));
flags = flags & LL_STATFS_NODELAY ? OBD_STATFS_NODELAY : 0;
- /* got statfs data */
- rc = obd_statfs(NULL, lov->lov_tgts[index]->ltd_exp, &stat_buf,
- cfs_time_shift_64(-OBD_STATFS_CACHE_SECONDS),
- flags);
- if (rc)
- RETURN(rc);
+ /* got statfs data */
+ rc = obd_statfs(NULL, lov->lov_tgts[index]->ltd_exp, &stat_buf,
+ ktime_get_seconds() - OBD_STATFS_CACHE_SECONDS,
+ flags);
+ if (rc)
+ RETURN(rc);
if (copy_to_user(data->ioc_pbuf1, &stat_buf,
min_t(unsigned long, data->ioc_plen1,
sizeof(struct obd_statfs))))
RETURN(-EFAULT);
break;
}
- case OBD_IOC_LOV_GET_CONFIG: {
- struct obd_ioctl_data *data;
- struct lov_desc *desc;
- char *buf = NULL;
- __u32 *genp;
-
- len = 0;
- if (obd_ioctl_getdata(&buf, &len, uarg))
- RETURN(-EINVAL);
-
- data = (struct obd_ioctl_data *)buf;
-
- if (sizeof(*desc) > data->ioc_inllen1) {
- obd_ioctl_freedata(buf, len);
- RETURN(-EINVAL);
- }
-
- if (sizeof(uuidp->uuid) * count > data->ioc_inllen2) {
- obd_ioctl_freedata(buf, len);
- RETURN(-EINVAL);
- }
-
- if (sizeof(__u32) * count > data->ioc_inllen3) {
- obd_ioctl_freedata(buf, len);
- RETURN(-EINVAL);
- }
-
- desc = (struct lov_desc *)data->ioc_inlbuf1;
- memcpy(desc, &(lov->desc), sizeof(*desc));
-
- uuidp = (struct obd_uuid *)data->ioc_inlbuf2;
- genp = (__u32 *)data->ioc_inlbuf3;
- /* the uuid will be empty for deleted OSTs */
- for (i = 0; i < count; i++, uuidp++, genp++) {
- if (!lov->lov_tgts[i])
- continue;
- *uuidp = lov->lov_tgts[i]->ltd_uuid;
- *genp = lov->lov_tgts[i]->ltd_gen;
- }
-
- if (copy_to_user(uarg, buf, len))
- rc = -EFAULT;
- obd_ioctl_freedata(buf, len);
- break;
- }
case OBD_IOC_QUOTACTL: {
struct if_quotactl *qctl = karg;
struct lov_tgt_desc *tgt = NULL;
OBD_FREE_PTR(oqctl);
break;
}
- default: {
- int set = 0;
+ default: {
+ int set = 0;
- if (count == 0)
- RETURN(-ENOTTY);
+ if (count == 0)
+ RETURN(-ENOTTY);
- for (i = 0; i < count; i++) {
- int err;
- struct obd_device *osc_obd;
+ for (i = 0; i < count; i++) {
+ int err;
+ struct obd_device *osc_obd;
- /* OST was disconnected */
- if (!lov->lov_tgts[i] || !lov->lov_tgts[i]->ltd_exp)
- continue;
+ /* OST was disconnected */
+ if (!lov->lov_tgts[i] || !lov->lov_tgts[i]->ltd_exp)
+ continue;
- /* ll_umount_begin() sets force flag but for lov, not
- * osc. Let's pass it through */
- osc_obd = class_exp2obd(lov->lov_tgts[i]->ltd_exp);
- osc_obd->obd_force = obddev->obd_force;
- err = obd_iocontrol(cmd, lov->lov_tgts[i]->ltd_exp,
- len, karg, uarg);
+ /* ll_umount_begin() sets force on lov, pass to osc */
+ osc_obd = class_exp2obd(lov->lov_tgts[i]->ltd_exp);
+ if (osc_obd)
+ osc_obd->obd_force = obd->obd_force;
+ err = obd_iocontrol(cmd, lov->lov_tgts[i]->ltd_exp,
+ len, karg, uarg);
if (err) {
- if (lov->lov_tgts[i]->ltd_active) {
- CDEBUG(err == -ENOTTY ?
- D_IOCTL : D_WARNING,
- "iocontrol OSC %s on OST "
- "idx %d cmd %x: err = %d\n",
- lov_uuid2str(lov, i),
- i, cmd, err);
- if (!rc)
- rc = err;
- }
- } else {
- set = 1;
- }
- }
- if (!set && !rc)
- rc = -EIO;
- }
- }
+ if (lov->lov_tgts[i]->ltd_active) {
+ CDEBUG_LIMIT(err == -ENOTTY ?
+ D_IOCTL : D_WARNING,
+ "iocontrol OSC %s on OST idx %d cmd %x: err = %d\n",
+ lov_uuid2str(lov, i),
+ i, cmd, err);
+ if (!rc)
+ rc = err;
+ }
+ } else {
+ set = 1;
+ }
+ }
+ if (!set && !rc)
+ rc = -EIO;
+ }
+ }
- RETURN(rc);
+ RETURN(rc);
}
static int lov_get_info(const struct lu_env *env, struct obd_export *exp,
__u32 keylen, void *key, __u32 *vallen, void *val)
{
- struct obd_device *obddev = class_exp2obd(exp);
- struct lov_obd *lov = &obddev->u.lov;
+ struct obd_device *obd = class_exp2obd(exp);
+ struct lov_obd *lov = &obd->u.lov;
struct lov_desc *ld = &lov->desc;
int rc = 0;
ENTRY;
if (vallen == NULL || val == NULL)
RETURN(-EFAULT);
- obd_getref(obddev);
+ lov_tgts_getref(obd);
if (KEY_IS(KEY_MAX_EASIZE)) {
- u32 max_stripe_count = min_t(u32, ld->ld_active_tgt_count,
- LOV_MAX_STRIPE_COUNT);
-
- *((u32 *)val) = lov_mds_md_size(max_stripe_count, LOV_MAGIC_V3);
+ *((u32 *)val) = exp->exp_connect_data.ocd_max_easize;
} else if (KEY_IS(KEY_DEFAULT_EASIZE)) {
u32 def_stripe_count = min_t(u32, ld->ld_default_stripe_count,
LOV_MAX_STRIPE_COUNT);
rc = -EINVAL;
}
- obd_putref(obddev);
+ lov_tgts_putref(obd);
RETURN(rc);
}
__u32 vallen, void *val,
struct ptlrpc_request_set *set)
{
- struct obd_device *obddev = class_exp2obd(exp);
- struct lov_obd *lov = &obddev->u.lov;
+ struct obd_device *obd = class_exp2obd(exp);
+ struct lov_obd *lov = &obd->u.lov;
struct lov_tgt_desc *tgt;
- int do_inactive = 0;
- int no_set = 0;
- u32 count;
+ bool do_inactive = false, no_set = false;
u32 i;
int rc = 0;
int err;
- ENTRY;
- if (set == NULL) {
- no_set = 1;
- set = ptlrpc_prep_set();
- if (!set)
- RETURN(-ENOMEM);
- }
-
- obd_getref(obddev);
- count = lov->desc.ld_tgt_count;
+ ENTRY;
- if (KEY_IS(KEY_CHECKSUM)) {
- do_inactive = 1;
- } else if (KEY_IS(KEY_CACHE_SET)) {
- LASSERT(lov->lov_cache == NULL);
- lov->lov_cache = val;
- do_inactive = 1;
- cl_cache_incref(lov->lov_cache);
+ if (set == NULL) {
+ no_set = true;
+ set = ptlrpc_prep_set();
+ if (!set)
+ RETURN(-ENOMEM);
}
- for (i = 0; i < count; i++) {
+ lov_tgts_getref(obd);
+
+ if (KEY_IS(KEY_CHECKSUM))
+ do_inactive = true;
+
+ for (i = 0; i < lov->desc.ld_tgt_count; i++) {
tgt = lov->lov_tgts[i];
- /* OST was disconnected */
- if (!tgt || !tgt->ltd_exp)
- continue;
+ /* OST was disconnected */
+ if (tgt == NULL || tgt->ltd_exp == NULL)
+ continue;
- /* OST is inactive and we don't want inactive OSCs */
- if (!tgt->ltd_active && !do_inactive)
- continue;
+ /* OST is inactive and we don't want inactive OSCs */
+ if (!tgt->ltd_active && !do_inactive)
+ continue;
err = obd_set_info_async(env, tgt->ltd_exp, keylen, key,
vallen, val, set);
- if (!rc)
- rc = err;
- }
- obd_putref(obddev);
- if (no_set) {
- err = ptlrpc_set_wait(set);
- if (!rc)
- rc = err;
- ptlrpc_set_destroy(set);
- }
- RETURN(rc);
+ if (rc == 0)
+ rc = err;
+ }
+
+ /* cycle through MDC target for Data-on-MDT */
+ for (i = 0; i < LOV_MDC_TGT_MAX; i++) {
+ struct obd_device *mdc;
+
+ mdc = lov->lov_mdc_tgts[i].lmtd_mdc;
+ if (mdc == NULL)
+ continue;
+
+ err = obd_set_info_async(env, mdc->obd_self_export,
+ keylen, key, vallen, val, set);
+ if (rc == 0)
+ rc = err;
+ }
+
+ lov_tgts_putref(obd);
+ if (no_set) {
+ err = ptlrpc_set_wait(env, set);
+ if (rc == 0)
+ rc = err;
+ ptlrpc_set_destroy(set);
+ }
+ RETURN(rc);
}
void lov_stripe_lock(struct lov_stripe_md *md)
__acquires(&md->lsm_lock)
{
- LASSERT(md->lsm_lock_owner != current_pid());
+ LASSERT(md->lsm_lock_owner != current->pid);
spin_lock(&md->lsm_lock);
LASSERT(md->lsm_lock_owner == 0);
- md->lsm_lock_owner = current_pid();
+ md->lsm_lock_owner = current->pid;
}
void lov_stripe_unlock(struct lov_stripe_md *md)
__releases(&md->lsm_lock)
{
- LASSERT(md->lsm_lock_owner == current_pid());
+ LASSERT(md->lsm_lock_owner == current->pid);
md->lsm_lock_owner = 0;
spin_unlock(&md->lsm_lock);
}
static int lov_quotactl(struct obd_device *obd, struct obd_export *exp,
- struct obd_quotactl *oqctl)
+ struct obd_quotactl *oqctl)
{
- struct lov_obd *lov = &obd->u.lov;
- struct lov_tgt_desc *tgt;
- __u64 curspace = 0;
- __u64 bhardlimit = 0;
- int i, rc = 0;
- ENTRY;
+ struct lov_obd *lov = &obd->u.lov;
+ struct lov_tgt_desc *tgt;
+ struct pool_desc *pool = NULL;
+ __u64 curspace = 0;
+ __u64 bhardlimit = 0;
+ int i, rc = 0;
+ ENTRY;
if (oqctl->qc_cmd != Q_GETOQUOTA &&
- oqctl->qc_cmd != LUSTRE_Q_SETQUOTA) {
- CERROR("%s: bad quota opc %x for lov obd\n",
- obd->obd_name, oqctl->qc_cmd);
- RETURN(-EFAULT);
+ oqctl->qc_cmd != LUSTRE_Q_SETQUOTA &&
+ oqctl->qc_cmd != LUSTRE_Q_GETQUOTAPOOL) {
+ rc = -EFAULT;
+ CERROR("%s: bad quota opc %x for lov obd: rc = %d\n",
+ obd->obd_name, oqctl->qc_cmd, rc);
+ RETURN(rc);
+ }
+
+ if (oqctl->qc_cmd == LUSTRE_Q_GETQUOTAPOOL) {
+ pool = lov_pool_find(obd, oqctl->qc_poolname);
+ if (!pool)
+ RETURN(-ENOENT);
+ /* Set Q_GETOQUOTA back as targets report it's own
+ * usage and doesn't care about pools */
+ oqctl->qc_cmd = Q_GETOQUOTA;
}
/* for lov tgt */
- obd_getref(obd);
+ lov_tgts_getref(obd);
for (i = 0; i < lov->desc.ld_tgt_count; i++) {
int err;
if (!tgt)
continue;
- if (!tgt->ltd_active || tgt->ltd_reap) {
- if (oqctl->qc_cmd == Q_GETOQUOTA &&
- lov->lov_tgts[i]->ltd_activate) {
+ if (pool &&
+ tgt_check_index(tgt->ltd_index, &pool->pool_obds))
+ continue;
+
+ if (!tgt->ltd_active || tgt->ltd_reap) {
+ if (oqctl->qc_cmd == Q_GETOQUOTA &&
+ lov->lov_tgts[i]->ltd_activate) {
rc = -ENETDOWN;
- CERROR("ost %d is inactive\n", i);
- } else {
- CDEBUG(D_HA, "ost %d is inactive\n", i);
- }
- continue;
- }
+ CERROR("%s: ost %d is inactive: rc = %d\n",
+ obd->obd_name, i, rc);
+ } else {
+ CDEBUG(D_HA, "ost %d is inactive\n", i);
+ }
+ continue;
+ }
err = obd_quotactl(tgt->ltd_exp, oqctl);
if (err) {
bhardlimit += oqctl->qc_dqblk.dqb_bhardlimit;
}
}
- obd_putref(obd);
+ lov_tgts_putref(obd);
+ if (pool)
+ lov_pool_putref(pool);
if (oqctl->qc_cmd == Q_GETOQUOTA) {
oqctl->qc_dqblk.dqb_curspace = curspace;
RETURN(rc);
}
-static struct obd_ops lov_obd_ops = {
+static const struct obd_ops lov_obd_ops = {
.o_owner = THIS_MODULE,
.o_setup = lov_setup,
.o_cleanup = lov_cleanup,
.o_connect = lov_connect,
.o_disconnect = lov_disconnect,
.o_statfs = lov_statfs,
- .o_statfs_async = lov_statfs_async,
.o_iocontrol = lov_iocontrol,
.o_get_info = lov_get_info,
.o_set_info_async = lov_set_info_async,
.o_pool_rem = lov_pool_remove,
.o_pool_add = lov_pool_add,
.o_pool_del = lov_pool_del,
- .o_getref = lov_getref,
- .o_putref = lov_putref,
.o_quotactl = lov_quotactl,
};
static int __init lov_init(void)
{
- bool enable_proc = true;
- struct obd_type *type;
int rc;
ENTRY;
return -ENOMEM;
}
- type = class_search_type(LUSTRE_LOD_NAME);
- if (type != NULL && type->typ_procsym != NULL)
- enable_proc = false;
-
- rc = class_register_type(&lov_obd_ops, NULL, enable_proc, NULL,
+ rc = class_register_type(&lov_obd_ops, NULL, true,
LUSTRE_LOV_NAME, &lov_device_type);
-
if (rc) {
kmem_cache_destroy(lov_oinfo_slab);
lu_kmem_fini(lov_caches);
git://git.whamcloud.com / fs / lustre-release.git / blobdiff