* Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2011, 2013, Intel Corporation.
+ * Copyright (c) 2011, 2014, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
#define DEBUG_SUBSYSTEM S_FLD
-#ifdef __KERNEL__
-# include <libcfs/libcfs.h>
-# include <linux/module.h>
-# include <linux/math64.h>
-#else /* __KERNEL__ */
-# include <liblustre.h>
-# include <libcfs/list.h>
-#endif
+#include <libcfs/libcfs.h>
+#include <linux/module.h>
+#include <linux/math64.h>
#include <obd.h>
#include <obd_class.h>
.fh_scan_func = fld_rrb_scan
},
{
- 0,
+ NULL,
}
};
LASSERT(name != NULL);
LASSERT(tar->ft_srv != NULL || tar->ft_exp != NULL);
- if (fld->lcf_flags != LUSTRE_FLD_INIT) {
- CERROR("%s: Attempt to add target %s (idx "LPU64") "
- "on fly - skip it\n", fld->lcf_name, name,
- tar->ft_idx);
- RETURN(0);
- } else {
- CDEBUG(D_INFO, "%s: Adding target %s (idx "
- LPU64")\n", fld->lcf_name, name, tar->ft_idx);
- }
+ CDEBUG(D_INFO, "%s: Adding target %s (idx "LPU64")\n", fld->lcf_name,
+ name, tar->ft_idx);
OBD_ALLOC_PTR(target);
if (target == NULL)
spin_unlock(&fld->lcf_lock);
RETURN(-ENOENT);
}
-EXPORT_SYMBOL(fld_client_del_target);
-#ifdef LPROCFS
+#ifdef CONFIG_PROC_FS
static int fld_client_proc_init(struct lu_client_fld *fld)
{
int rc;
ENTRY;
- fld->lcf_proc_dir = lprocfs_seq_register(fld->lcf_name,
- fld_type_proc_dir,
- NULL, NULL);
+ fld->lcf_proc_dir = lprocfs_register(fld->lcf_name, fld_type_proc_dir,
+ NULL, NULL);
if (IS_ERR(fld->lcf_proc_dir)) {
CERROR("%s: LProcFS failed in fld-init\n",
fld->lcf_name);
RETURN(rc);
}
- rc = lprocfs_seq_add_vars(fld->lcf_proc_dir,
- fld_client_proc_list, fld);
+ rc = lprocfs_add_vars(fld->lcf_proc_dir, fld_client_proc_list, fld);
if (rc) {
CERROR("%s: Can't init FLD proc, rc %d\n",
fld->lcf_name, rc);
}
EXIT;
}
-#else
+#else /* !CONFIG_PROC_FS */
static int fld_client_proc_init(struct lu_client_fld *fld)
{
return 0;
{
return;
}
-#endif
+#endif /* CONFIG_PROC_FS */
EXPORT_SYMBOL(fld_client_proc_fini);
RETURN(-EINVAL);
}
- fld->lcf_count = 0;
+ fld->lcf_count = 0;
spin_lock_init(&fld->lcf_lock);
- fld->lcf_hash = &fld_hash[hash];
- fld->lcf_flags = LUSTRE_FLD_INIT;
+ fld->lcf_hash = &fld_hash[hash];
INIT_LIST_HEAD(&fld->lcf_targets);
cache_size = FLD_CLIENT_CACHE_SIZE /
obd_get_request_slot(&exp->exp_obd->u.cli);
rc = ptlrpc_queue_wait(req);
obd_put_request_slot(&exp->exp_obd->u.cli);
+
+ if (rc == -ENOENT) {
+ /* Don't loop forever on non-existing FID sequences. */
+ GOTO(out_req, rc);
+ }
+
if (rc != 0) {
- if (imp->imp_state != LUSTRE_IMP_CLOSED) {
+ if (imp->imp_state != LUSTRE_IMP_CLOSED && !imp->imp_deactive) {
/* Since LWP is not replayable, so it will keep
* trying unless umount happens, otherwise it would
* cause unecessary failure of the application. */
{
struct lu_seq_range res = { 0 };
struct lu_fld_target *target;
+ struct lu_fld_target *origin;
int rc;
ENTRY;
- fld->lcf_flags |= LUSTRE_FLD_RUN;
-
- rc = fld_cache_lookup(fld->lcf_cache, seq, &res);
- if (rc == 0) {
- *mds = res.lsr_index;
- RETURN(0);
- }
+ rc = fld_cache_lookup(fld->lcf_cache, seq, &res);
+ if (rc == 0) {
+ *mds = res.lsr_index;
+ RETURN(0);
+ }
/* Can not find it in the cache */
target = fld_client_get_target(fld, seq);
LASSERT(target != NULL);
-
+ origin = target;
+again:
CDEBUG(D_INFO, "%s: Lookup fld entry (seq: "LPX64") on "
"target %s (idx "LPU64")\n", fld->lcf_name, seq,
fld_target_name(target), target->ft_idx);
res.lsr_start = seq;
fld_range_set_type(&res, flags);
-#if defined(__KERNEL__) && defined(HAVE_SERVER_SUPPORT)
+#ifdef HAVE_SERVER_SUPPORT
if (target->ft_srv != NULL) {
LASSERT(env != NULL);
rc = fld_server_lookup(env, target->ft_srv, seq, &res);
} else
-#endif
+#endif /* HAVE_SERVER_SUPPORT */
{
rc = fld_client_rpc(target->ft_exp, &res, FLD_QUERY, NULL);
}
+ if (rc == -ESHUTDOWN) {
+ /* If fld lookup failed because the target has been shutdown,
+ * then try next target in the list, until trying all targets
+ * or fld lookup succeeds */
+ spin_lock(&fld->lcf_lock);
+ if (target->ft_chain.next == fld->lcf_targets.prev)
+ target = list_entry(fld->lcf_targets.next,
+ struct lu_fld_target, ft_chain);
+ else
+ target = list_entry(target->ft_chain.next,
+ struct lu_fld_target,
+ ft_chain);
+ spin_unlock(&fld->lcf_lock);
+ if (target != origin)
+ goto again;
+ }
if (rc == 0) {
*mds = res.lsr_index;
fld_cache_insert(fld->lcf_cache, &res);
{
fld_cache_flush(fld->lcf_cache);
}
-EXPORT_SYMBOL(fld_client_flush);
-#ifdef __KERNEL__
struct proc_dir_entry *fld_type_proc_dir;
static int __init fld_mod_init(void)
{
- fld_type_proc_dir = lprocfs_seq_register(LUSTRE_FLD_NAME,
- proc_lustre_root,
- NULL, NULL);
+ fld_type_proc_dir = lprocfs_register(LUSTRE_FLD_NAME,
+ proc_lustre_root,
+ NULL, NULL);
if (IS_ERR(fld_type_proc_dir))
return PTR_ERR(fld_type_proc_dir);
#ifdef HAVE_SERVER_SUPPORT
fld_server_mod_init();
-#endif
+#endif /* HAVE_SERVER_SUPPORT */
return 0;
}
{
#ifdef HAVE_SERVER_SUPPORT
fld_server_mod_exit();
-#endif
+#endif /* HAVE_SERVER_SUPPORT */
if (fld_type_proc_dir != NULL && !IS_ERR(fld_type_proc_dir)) {
lprocfs_remove(&fld_type_proc_dir);
MODULE_AUTHOR("Sun Microsystems, Inc. <http://www.lustre.org/>");
MODULE_DESCRIPTION("Lustre FLD");
+MODULE_VERSION(LUSTRE_VERSION_STRING);
MODULE_LICENSE("GPL");
-cfs_module(mdd, LUSTRE_VERSION_STRING, fld_mod_init, fld_mod_exit);
-#endif /* __KERNEL__ */
+module_init(fld_mod_init);
+module_exit(fld_mod_exit);
git://git.whamcloud.com / fs / lustre-release.git / blobdiff