From: NeilBrown <neilb@suse.com>
To: lustre-devel@lists.lustre.org
Subject: [lustre-devel] [PATCH 28/37] lustre: remove scope and source from class_incref and class_decref.
Date: Tue, 19 Feb 2019 11:09:06 +1100 [thread overview]
Message-ID: <155053494637.24125.716197573687357279.stgit@noble.brown> (raw)
In-Reply-To: <155053473693.24125.6976971762921761309.stgit@noble.brown>
These arguments are no longer used, so we can discard them.
Signed-off-by: NeilBrown <neilb@suse.com>
---
drivers/staging/lustre/lustre/include/obd_class.h | 6 ++----
drivers/staging/lustre/lustre/obdclass/genops.c | 12 ++++++------
.../staging/lustre/lustre/obdclass/obd_config.c | 17 ++++++++---------
drivers/staging/lustre/lustre/obdclass/obd_sysfs.c | 4 ++--
4 files changed, 18 insertions(+), 21 deletions(-)
diff --git a/drivers/staging/lustre/lustre/include/obd_class.h b/drivers/staging/lustre/lustre/include/obd_class.h
index dd480501d7df..a913ef76a008 100644
--- a/drivers/staging/lustre/lustre/include/obd_class.h
+++ b/drivers/staging/lustre/lustre/include/obd_class.h
@@ -133,10 +133,8 @@ int class_parse_net(char *buf, u32 *net, char **endh);
int class_match_nid(char *buf, char *key, lnet_nid_t nid);
int class_match_net(char *buf, char *key, u32 net);
-struct obd_device *class_incref(struct obd_device *obd,
- const char *scope, const void *source);
-void class_decref(struct obd_device *obd,
- const char *scope, const void *source);
+struct obd_device *class_incref(struct obd_device *obd);
+void class_decref(struct obd_device *obd);
int class_config_llog_handler(const struct lu_env *env,
struct llog_handle *handle,
struct llog_rec_hdr *rec, void *data);
diff --git a/drivers/staging/lustre/lustre/obdclass/genops.c b/drivers/staging/lustre/lustre/obdclass/genops.c
index ce92c8c1dc75..fc7985a2922c 100644
--- a/drivers/staging/lustre/lustre/obdclass/genops.c
+++ b/drivers/staging/lustre/lustre/obdclass/genops.c
@@ -622,13 +622,13 @@ int class_notify_sptlrpc_conf(const char *fsname, int namelen)
if (strncmp(obd->obd_name, fsname, namelen))
continue;
- class_incref(obd, __func__, obd);
+ class_incref(obd);
read_unlock(&obd_dev_lock);
rc2 = obd_set_info_async(NULL, obd->obd_self_export,
sizeof(KEY_SPTLRPC_CONF),
KEY_SPTLRPC_CONF, 0, NULL, NULL);
rc = rc ? rc : rc2;
- class_decref(obd, __func__, obd);
+ class_decref(obd);
read_lock(&obd_dev_lock);
}
read_unlock(&obd_dev_lock);
@@ -737,7 +737,7 @@ static void class_export_destroy(struct obd_export *exp)
* exists until freeing of the obd
*/
if (exp != obd->obd_self_export)
- class_decref(obd, "export", exp);
+ class_decref(obd);
OBD_FREE_RCU(exp, sizeof(*exp), &exp->exp_handle);
}
@@ -863,7 +863,7 @@ static struct obd_export *__class_new_export(struct obd_device *obd,
}
if (!is_self) {
- class_incref(obd, "export", export);
+ class_incref(obd);
list_add(&export->exp_obd_chain, &export->exp_obd->obd_exports);
obd->obd_num_exports++;
} else {
@@ -934,7 +934,7 @@ static void class_import_destroy(struct obd_import *imp)
}
LASSERT(!imp->imp_sec);
- class_decref(imp->imp_obd, "import", imp);
+ class_decref(imp->imp_obd);
OBD_FREE_RCU(imp, sizeof(*imp), &imp->imp_handle);
}
@@ -1017,7 +1017,7 @@ struct obd_import *class_new_import(struct obd_device *obd)
spin_lock_init(&imp->imp_lock);
imp->imp_last_success_conn = 0;
imp->imp_state = LUSTRE_IMP_NEW;
- imp->imp_obd = class_incref(obd, "import", imp);
+ imp->imp_obd = class_incref(obd);
mutex_init(&imp->imp_sec_mutex);
init_waitqueue_head(&imp->imp_recovery_waitq);
INIT_WORK(&imp->imp_zombie_work, obd_zombie_imp_cull);
diff --git a/drivers/staging/lustre/lustre/obdclass/obd_config.c b/drivers/staging/lustre/lustre/obdclass/obd_config.c
index 45e8f03dec80..776f251e9f43 100644
--- a/drivers/staging/lustre/lustre/obdclass/obd_config.c
+++ b/drivers/staging/lustre/lustre/obdclass/obd_config.c
@@ -334,7 +334,7 @@ static int class_attach(struct lustre_cfg *lcfg)
rc = class_register_device(obd);
if (rc) {
- class_decref(obd, "newdev", obd);
+ class_decref(obd);
return rc;
}
@@ -399,7 +399,7 @@ static int class_setup(struct obd_device *obd, struct lustre_cfg *lcfg)
spin_lock(&obd->obd_dev_lock);
/* cleanup drops this */
- class_incref(obd, "setup", obd);
+ class_incref(obd);
spin_unlock(&obd->obd_dev_lock);
CDEBUG(D_IOCTL, "finished setup of obd %s (uuid %s)\n",
@@ -439,7 +439,7 @@ static int class_detach(struct obd_device *obd, struct lustre_cfg *lcfg)
CDEBUG(D_IOCTL, "detach on obd %s (uuid %s)\n",
obd->obd_name, obd->obd_uuid.uuid);
- class_decref(obd, "newdev", obd);
+ class_decref(obd);
return 0;
}
@@ -511,14 +511,13 @@ static int class_cleanup(struct obd_device *obd, struct lustre_cfg *lcfg)
/* destroy an uuid-export hash body */
rhashtable_free_and_destroy(&obd->obd_uuid_hash, uuid_export_exit, NULL);
- class_decref(obd, "setup", obd);
+ class_decref(obd);
obd->obd_set_up = 0;
return 0;
}
-struct obd_device *class_incref(struct obd_device *obd,
- const char *scope, const void *source)
+struct obd_device *class_incref(struct obd_device *obd)
{
atomic_inc(&obd->obd_refcount);
CDEBUG(D_INFO, "incref %s (%p) now %d\n", obd->obd_name, obd,
@@ -528,12 +527,12 @@ struct obd_device *class_incref(struct obd_device *obd,
}
EXPORT_SYMBOL(class_incref);
-void class_decref(struct obd_device *obd, const char *scope, const void *source)
+void class_decref(struct obd_device *obd)
{
int last;
- CDEBUG(D_INFO, "Decref %s (%p) now %d - %s\n", obd->obd_name, obd,
- atomic_read(&obd->obd_refcount), scope);
+ CDEBUG(D_INFO, "Decref %s (%p) now %d\n", obd->obd_name, obd,
+ atomic_read(&obd->obd_refcount));
LASSERT(obd->obd_num_exports >= 0);
last = atomic_dec_and_test(&obd->obd_refcount);
diff --git a/drivers/staging/lustre/lustre/obdclass/obd_sysfs.c b/drivers/staging/lustre/lustre/obdclass/obd_sysfs.c
index e9e0bcf39d4e..57a6f2c2da1c 100644
--- a/drivers/staging/lustre/lustre/obdclass/obd_sysfs.c
+++ b/drivers/staging/lustre/lustre/obdclass/obd_sysfs.c
@@ -188,12 +188,12 @@ health_check_show(struct kobject *kobj, struct attribute *attr, char *buf)
if (obd->obd_stopping)
continue;
- class_incref(obd, __func__, current);
+ class_incref(obd);
read_unlock(&obd_dev_lock);
if (obd_health_check(NULL, obd))
healthy = false;
- class_decref(obd, __func__, current);
+ class_decref(obd);
read_lock(&obd_dev_lock);
}
read_unlock(&obd_dev_lock);
next prev parent reply other threads:[~2019-02-19 0:09 UTC|newest]
Thread overview: 105+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-19 0:09 [lustre-devel] [PATCH 00/37] More lustre patches from obdclass NeilBrown
2019-02-19 0:09 ` [lustre-devel] [PATCH 01/37] lustre: obdclass: char obd_ioctl_getdata type NeilBrown
2019-02-24 18:35 ` James Simmons
2019-02-19 0:09 ` [lustre-devel] [PATCH 02/37] lustre: llite: don't use class_setup_tunables() NeilBrown
2019-02-24 16:35 ` James Simmons
2019-02-25 22:27 ` NeilBrown
2019-02-26 22:18 ` James Simmons
2019-02-24 16:52 ` [lustre-devel] [PATCH 03/37] lustre: embed typ_kobj if obd_type James Simmons
2019-02-25 22:38 ` NeilBrown
2019-02-26 20:41 ` Simmons, James A.
2019-02-19 0:09 ` [lustre-devel] [PATCH 14/37] lustre: llog: change lgh_refcount to struct kref NeilBrown
2019-02-25 18:16 ` Andreas Dilger
2019-02-19 0:09 ` [lustre-devel] [PATCH 13/37] lustre: llog: remove lgh_hdr_lock NeilBrown
2019-02-24 20:29 ` James Simmons
2019-02-25 18:16 ` Andreas Dilger
2019-02-19 0:09 ` [lustre-devel] [PATCH 07/37] lustre: obd_type: discard obd_type_lock NeilBrown
2019-02-24 17:02 ` James Simmons
2019-02-19 0:09 ` [lustre-devel] [PATCH 08/37] lustre: obdclass: don't copy ops structures in to new type NeilBrown
2019-02-24 17:03 ` James Simmons
2019-02-19 0:09 ` [lustre-devel] [PATCH 16/37] lustre: obdclass: typo: Banlance -> Balance NeilBrown
2019-02-24 17:39 ` James Simmons
2019-02-19 0:09 ` [lustre-devel] [PATCH 05/37] lustre: obd_type: use typ_kobj.name as typ_name NeilBrown
2019-02-24 16:56 ` James Simmons
2019-02-19 0:09 ` [lustre-devel] [PATCH 03/37] lustre: embed typ_kobj if obd_type NeilBrown
2019-02-19 0:09 ` [lustre-devel] [PATCH 09/37] lustre: obdclass: fix module load locking NeilBrown
2019-02-24 17:04 ` James Simmons
2019-02-19 0:09 ` [lustre-devel] [PATCH 17/37] lustre: simplify lprocfs_read_frac_helper NeilBrown
2019-02-24 17:52 ` James Simmons
2019-02-26 23:59 ` NeilBrown
2019-02-27 1:06 ` Andreas Dilger
2019-02-19 0:09 ` [lustre-devel] [PATCH 18/37] lustre: obdclass: discard lprocfs_single/seq_release NeilBrown
2019-02-24 17:53 ` James Simmons
2019-02-19 0:09 ` [lustre-devel] [PATCH 12/37] lustre: remove unused function in linkea NeilBrown
2019-02-25 18:16 ` Andreas Dilger
2019-02-19 0:09 ` [lustre-devel] [PATCH 10/37] lustre: kernelcomm: pass correct gfp_t to kmalloc NeilBrown
2019-02-24 17:05 ` James Simmons
2019-02-25 18:16 ` Andreas Dilger
2019-02-19 0:09 ` [lustre-devel] [PATCH 21/37] lustre: remove several MAX_STRING_SIZE defines NeilBrown
2019-02-24 19:07 ` James Simmons
2019-02-27 0:41 ` NeilBrown
2019-02-25 18:16 ` Andreas Dilger
2019-02-19 0:09 ` [lustre-devel] [PATCH 19/37] lustre: discard lprocfs_strnstr() NeilBrown
2019-02-24 17:53 ` James Simmons
2019-02-19 0:09 ` [lustre-devel] [PATCH 15/37] lustre: llog_obd: Convert loc_refcount to refcount_t NeilBrown
2019-02-25 18:16 ` Andreas Dilger
2019-02-19 0:09 ` [lustre-devel] [PATCH 11/37] lustre: kernelcomm: make libcfs_kkuc_msg_put static NeilBrown
2019-02-24 17:15 ` James Simmons
2019-02-26 23:45 ` NeilBrown
2019-02-27 22:36 ` James Simmons
2019-02-27 22:37 ` James Simmons
2019-02-19 0:09 ` [lustre-devel] [PATCH 04/37] lustre: collect all resource releasing for obj_type NeilBrown
2019-02-24 16:54 ` James Simmons
2019-02-19 0:09 ` [lustre-devel] [PATCH 06/37] lustre: obd_type: discard obd_types linked list NeilBrown
2019-02-24 17:00 ` James Simmons
2019-02-19 0:09 ` [lustre-devel] [PATCH 20/37] lustre: convert rsi_sem to a spinlock NeilBrown
2019-02-25 18:16 ` Andreas Dilger
2019-02-27 0:22 ` NeilBrown
2019-02-27 1:00 ` Andreas Dilger
2019-02-19 0:09 ` [lustre-devel] [PATCH 32/37] lustre: portals_handle: rename ops to owner NeilBrown
2019-02-19 0:09 ` [lustre-devel] [PATCH 22/37] lustre: lprocfs: use log2.h macros instead of shift loop NeilBrown
2019-02-24 18:09 ` James Simmons
2019-02-26 20:55 ` James Simmons
2019-02-27 0:51 ` NeilBrown
2019-02-27 0:54 ` Andreas Dilger
2019-02-19 0:09 ` [lustre-devel] [PATCH 25/37] lustre: deprecate libcfs_debug_vmsg2 NeilBrown
2019-02-24 20:02 ` James Simmons
2019-02-25 18:16 ` Andreas Dilger
2019-02-19 0:09 ` [lustre-devel] [PATCH 30/37] lustre: handle: move refcount into the lustre_handle NeilBrown
2019-02-27 6:32 ` Andreas Dilger
2019-02-27 21:48 ` NeilBrown
2019-02-27 22:14 ` Andreas Dilger
2019-02-19 0:09 ` NeilBrown [this message]
2019-02-27 6:52 ` [lustre-devel] [PATCH 28/37] lustre: remove scope and source from class_incref and class_decref Andreas Dilger
2019-02-28 0:39 ` NeilBrown
2019-02-19 0:09 ` [lustre-devel] [PATCH 26/37] lustre: remove libcfs_debug_vmsg2 NeilBrown
2019-02-25 18:16 ` Andreas Dilger
2019-02-19 0:09 ` [lustre-devel] [PATCH 23/37] lustre: prefer to use tabs for alignment NeilBrown
2019-02-24 18:51 ` James Simmons
2019-02-25 18:16 ` Andreas Dilger
2019-02-19 0:09 ` [lustre-devel] [PATCH 27/37] lustre: discard lu_ref NeilBrown
2019-02-24 20:28 ` James Simmons
2019-02-27 1:17 ` NeilBrown
2019-02-27 5:35 ` Andreas Dilger
2019-03-01 6:45 ` Mike Pershin
2019-02-19 0:09 ` [lustre-devel] [PATCH 29/37] lustre: handles: discard h_owner in favour of h_ops NeilBrown
2019-02-27 6:37 ` Andreas Dilger
2019-02-27 21:41 ` NeilBrown
2019-02-28 6:41 ` Andreas Dilger
2019-02-19 0:09 ` [lustre-devel] [PATCH 33/37] lustre: portals_handle: remove locking from class_handle2object() NeilBrown
2019-02-19 0:09 ` [lustre-devel] [PATCH 34/37] lustre: portals_handle: use hlist for hash lists NeilBrown
2019-02-19 0:09 ` [lustre-devel] [PATCH 31/37] lustre: discard OBD_FREE_RCU NeilBrown
2019-02-19 0:09 ` [lustre-devel] [PATCH 24/37] lustre: lu_object: remove extra newline from debug printing NeilBrown
2019-02-24 19:08 ` James Simmons
2019-02-25 18:16 ` Andreas Dilger
2019-02-19 0:09 ` [lustre-devel] [PATCH 35/37] lustre: portals_handle: discard h_lock NeilBrown
2019-02-19 0:09 ` [lustre-devel] [PATCH 37/37] lustre: obd_sysfs: error-check value stored in jobid_var NeilBrown
2019-02-27 6:17 ` Andreas Dilger
2019-03-01 2:35 ` NeilBrown
2019-03-01 8:32 ` Andreas Dilger
2019-03-01 14:30 ` Patrick Farrell
2019-03-14 0:34 ` NeilBrown
2019-03-14 14:12 ` Patrick Farrell
2019-03-14 22:56 ` NeilBrown
2019-03-14 23:05 ` Andreas Dilger
2019-02-19 0:09 ` [lustre-devel] [PATCH 36/37] lustre: remove unused fields from struct obd_device NeilBrown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=155053494637.24125.716197573687357279.stgit@noble.brown \
--to=neilb@suse.com \
--cc=lustre-devel@lists.lustre.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).