-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
* GPL HEADER START
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
/*
* Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
+ *
+ * Copyright (c) 2011, 2013, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
* Author: Yury Umanets <umka@clusterfs.com>
*/
-#ifndef EXPORT_SYMTAB
-# define EXPORT_SYMTAB
-#endif
#define DEBUG_SUBSYSTEM S_FLD
#ifdef __KERNEL__
};
static struct lu_fld_target *
-fld_client_get_target(struct lu_client_fld *fld,
- seqno_t seq)
+fld_client_get_target(struct lu_client_fld *fld, seqno_t seq)
{
- struct lu_fld_target *target;
- ENTRY;
+ struct lu_fld_target *target;
+ ENTRY;
- LASSERT(fld->lcf_hash != NULL);
+ LASSERT(fld->lcf_hash != NULL);
- cfs_spin_lock(&fld->lcf_lock);
- target = fld->lcf_hash->fh_scan_func(fld, seq);
- cfs_spin_unlock(&fld->lcf_lock);
+ spin_lock(&fld->lcf_lock);
+ target = fld->lcf_hash->fh_scan_func(fld, seq);
+ spin_unlock(&fld->lcf_lock);
if (target != NULL) {
CDEBUG(D_INFO, "%s: Found target (idx "LPU64
if (target == NULL)
RETURN(-ENOMEM);
- cfs_spin_lock(&fld->lcf_lock);
- cfs_list_for_each_entry(tmp, &fld->lcf_targets, ft_chain) {
- if (tmp->ft_idx == tar->ft_idx) {
- cfs_spin_unlock(&fld->lcf_lock);
+ spin_lock(&fld->lcf_lock);
+ cfs_list_for_each_entry(tmp, &fld->lcf_targets, ft_chain) {
+ if (tmp->ft_idx == tar->ft_idx) {
+ spin_unlock(&fld->lcf_lock);
OBD_FREE_PTR(target);
CERROR("Target %s exists in FLD and known as %s:#"LPU64"\n",
name, fld_target_name(tmp), tmp->ft_idx);
&fld->lcf_targets);
fld->lcf_count++;
- cfs_spin_unlock(&fld->lcf_lock);
+ spin_unlock(&fld->lcf_lock);
- RETURN(0);
+ RETURN(0);
}
EXPORT_SYMBOL(fld_client_add_target);
/* Remove export from FLD */
-int fld_client_del_target(struct lu_client_fld *fld,
- __u64 idx)
+int fld_client_del_target(struct lu_client_fld *fld, __u64 idx)
{
- struct lu_fld_target *target, *tmp;
- ENTRY;
+ struct lu_fld_target *target, *tmp;
+ ENTRY;
- cfs_spin_lock(&fld->lcf_lock);
- cfs_list_for_each_entry_safe(target, tmp,
- &fld->lcf_targets, ft_chain) {
- if (target->ft_idx == idx) {
- fld->lcf_count--;
- cfs_list_del(&target->ft_chain);
- cfs_spin_unlock(&fld->lcf_lock);
+ spin_lock(&fld->lcf_lock);
+ cfs_list_for_each_entry_safe(target, tmp,
+ &fld->lcf_targets, ft_chain) {
+ if (target->ft_idx == idx) {
+ fld->lcf_count--;
+ cfs_list_del(&target->ft_chain);
+ spin_unlock(&fld->lcf_lock);
if (target->ft_exp != NULL)
class_export_put(target->ft_exp);
RETURN(0);
}
}
- cfs_spin_unlock(&fld->lcf_lock);
- RETURN(-ENOENT);
+ spin_unlock(&fld->lcf_lock);
+ RETURN(-ENOENT);
}
EXPORT_SYMBOL(fld_client_del_target);
-static void fld_client_proc_fini(struct lu_client_fld *fld);
-
#ifdef LPROCFS
static int fld_client_proc_init(struct lu_client_fld *fld)
{
return rc;
}
-static void fld_client_proc_fini(struct lu_client_fld *fld)
+void fld_client_proc_fini(struct lu_client_fld *fld)
{
ENTRY;
if (fld->lcf_proc_dir) {
return 0;
}
-static void fld_client_proc_fini(struct lu_client_fld *fld)
+void fld_client_proc_fini(struct lu_client_fld *fld)
{
return;
}
#endif
+EXPORT_SYMBOL(fld_client_proc_fini);
+
static inline int hash_is_sane(int hash)
{
return (hash >= 0 && hash < ARRAY_SIZE(fld_hash));
}
fld->lcf_count = 0;
- cfs_spin_lock_init(&fld->lcf_lock);
+ spin_lock_init(&fld->lcf_lock);
fld->lcf_hash = &fld_hash[hash];
fld->lcf_flags = LUSTRE_FLD_INIT;
CFS_INIT_LIST_HEAD(&fld->lcf_targets);
void fld_client_fini(struct lu_client_fld *fld)
{
- struct lu_fld_target *target, *tmp;
- ENTRY;
-
- fld_client_proc_fini(fld);
+ struct lu_fld_target *target, *tmp;
+ ENTRY;
- cfs_spin_lock(&fld->lcf_lock);
+ spin_lock(&fld->lcf_lock);
cfs_list_for_each_entry_safe(target, tmp,
&fld->lcf_targets, ft_chain) {
fld->lcf_count--;
class_export_put(target->ft_exp);
OBD_FREE_PTR(target);
}
- cfs_spin_unlock(&fld->lcf_lock);
+ spin_unlock(&fld->lcf_lock);
if (fld->lcf_cache != NULL) {
if (!IS_ERR(fld->lcf_cache))
res.lsr_flags = flags;
#ifdef __KERNEL__
if (target->ft_srv != NULL) {
- LASSERT(env != NULL);
- rc = fld_server_lookup(target->ft_srv,
- env, seq, &res);
+ LASSERT(env != NULL);
+ rc = fld_server_lookup(env, target->ft_srv, seq, &res);
} else {
#endif
rc = fld_client_rpc(target->ft_exp,
if (rc == 0) {
*mds = res.lsr_index;
- fld_cache_insert(fld->lcf_cache, &res);
+ fld_cache_insert(fld->lcf_cache, &res);
}
RETURN(rc);
}