From: James Simmons <jsimmons@infradead.org>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
devel@driverdev.osuosl.org, Oleg Drokin <oleg.drokin@intel.com>,
Andreas Dilger <andreas.dilger@intel.com>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
lustre-devel@lists.lustre.org, James Simmons <uja.ornl@yahoo.com>,
James Simmons <jsimmons@infradead.org>
Subject: [PATCH 06/10] staging: lustre: convert last typedef data types in hash.c
Date: Wed, 28 Oct 2015 12:54:27 -0400 [thread overview]
Message-ID: <1446051271-25189-7-git-send-email-jsimmons@infradead.org> (raw)
In-Reply-To: <1446051271-25189-1-git-send-email-jsimmons@infradead.org>
From: James Simmons <uja.ornl@yahoo.com>
Change the last typedef data types cfs_hash_lookup_intent_t
to enum and cfs_hash_cond_arg_t to a structure.
Signed-off-by: James Simmons <jsimmons@infradead.org>
---
drivers/staging/lustre/lustre/libcfs/hash.c | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/staging/lustre/lustre/libcfs/hash.c b/drivers/staging/lustre/lustre/libcfs/hash.c
index c267f8a..0308744 100644
--- a/drivers/staging/lustre/lustre/libcfs/hash.c
+++ b/drivers/staging/lustre/lustre/libcfs/hash.c
@@ -606,7 +606,7 @@ enum {
CFS_HS_LOOKUP_MASK_DEL = BIT(3),
};
-typedef enum cfs_hash_lookup_intent {
+enum cfs_hash_lookup_intent {
/** return item w/o refcount */
CFS_HS_LOOKUP_IT_PEEK = CFS_HS_LOOKUP_MASK_FIND,
/** return item with refcount */
@@ -621,12 +621,12 @@ typedef enum cfs_hash_lookup_intent {
/** delete if existed */
CFS_HS_LOOKUP_IT_FINDDEL = (CFS_HS_LOOKUP_MASK_FIND |
CFS_HS_LOOKUP_MASK_DEL)
-} cfs_hash_lookup_intent_t;
+};
static struct hlist_node *
cfs_hash_bd_lookup_intent(struct cfs_hash *hs, struct cfs_hash_bd *bd,
const void *key, struct hlist_node *hnode,
- cfs_hash_lookup_intent_t intent)
+ enum cfs_hash_lookup_intent intent)
{
struct hlist_head *hhead = cfs_hash_bd_hhead(hs, bd);
@@ -1489,16 +1489,16 @@ cfs_hash_for_each_tight(struct cfs_hash *hs, cfs_hash_for_each_cb_t func,
return count;
}
-typedef struct {
- cfs_hash_cond_opt_cb_t func;
- void *arg;
-} cfs_hash_cond_arg_t;
+struct cfs_hash_cond_arg {
+ cfs_hash_cond_opt_cb_t func;
+ void *arg;
+};
static int
cfs_hash_cond_del_locked(struct cfs_hash *hs, struct cfs_hash_bd *bd,
struct hlist_node *hnode, void *data)
{
- cfs_hash_cond_arg_t *cond = data;
+ struct cfs_hash_cond_arg *cond = data;
if (cond->func(cfs_hash_object(hs, hnode), cond->arg))
cfs_hash_bd_del_locked(hs, bd, hnode);
@@ -1513,7 +1513,7 @@ cfs_hash_cond_del_locked(struct cfs_hash *hs, struct cfs_hash_bd *bd,
void
cfs_hash_cond_del(struct cfs_hash *hs, cfs_hash_cond_opt_cb_t func, void *data)
{
- cfs_hash_cond_arg_t arg = {
+ struct cfs_hash_cond_arg arg = {
.func = func,
.arg = data,
};
--
1.7.1
next prev parent reply other threads:[~2015-10-28 16:54 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-28 16:54 [PATCH 00/10] staging: lustre: cleanup up libcfs hash code for upstream James Simmons
2015-10-28 16:54 ` [PATCH 01/10] staging: lustre: change cfs_hash_lock_ops_t to struct James Simmons
2015-10-28 16:54 ` [PATCH 02/10] staging: lustre: change cfs_hash_hlist_ops_t " James Simmons
2015-10-28 16:54 ` [PATCH 03/10] staging: lustre: change cfs_hash_ops_t " James Simmons
2015-10-28 16:54 ` [PATCH 04/10] staging: lustre: change cfs_hash_dhead*_t " James Simmons
2015-10-28 16:54 ` [PATCH 05/10] staging: lustre: change cfs_hash_head*_t " James Simmons
2015-10-28 16:54 ` James Simmons [this message]
2015-10-28 16:54 ` [PATCH 07/10] staging: lustre: cleanup over 80 characters in libcfs_hash.h James Simmons
2015-10-28 16:54 ` [PATCH 08/10] staging: lustre: remove white space " James Simmons
2015-10-28 22:34 ` [lustre-devel] " Dilger, Andreas
2015-10-29 15:22 ` Simmons, James A.
2015-10-28 23:01 ` Greg Kroah-Hartman
2015-10-28 16:54 ` [PATCH 09/10] staging: lustre: fix remaining checkpatch issues for libcfs_hash.h James Simmons
2015-10-28 22:36 ` [lustre-devel] " Dilger, Andreas
2015-10-29 15:44 ` Simmons, James A.
2015-10-28 16:54 ` [PATCH 10/10] staging: lustre: remove white space in hash.c James Simmons
2015-10-28 23:02 ` Greg Kroah-Hartman
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=1446051271-25189-7-git-send-email-jsimmons@infradead.org \
--to=jsimmons@infradead.org \
--cc=andreas.dilger@intel.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lustre-devel@lists.lustre.org \
--cc=oleg.drokin@intel.com \
--cc=uja.ornl@yahoo.com \
/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
all inboxes | Powered by JetHome®