Skip to content

Commit

Permalink
SUNRPC: Refactor sunrpc_cache_lookup
Browse files Browse the repository at this point in the history
This is a trivial split into lookup and insert functions, no change in
behavior.

Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
  • Loading branch information
Trond Myklebust authored and J. Bruce Fields committed Oct 3, 2018
1 parent 608a0ab commit b92a8fa
Showing 1 changed file with 25 additions and 8 deletions.
33 changes: 25 additions & 8 deletions net/sunrpc/cache.c
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,11 @@ static void cache_init(struct cache_head *h, struct cache_detail *detail)
h->last_refresh = now;
}

struct cache_head *sunrpc_cache_lookup(struct cache_detail *detail,
struct cache_head *key, int hash)
static struct cache_head *sunrpc_cache_find(struct cache_detail *detail,
struct cache_head *key, int hash)
{
struct cache_head *new = NULL, *freeme = NULL, *tmp = NULL;
struct hlist_head *head;

head = &detail->hash_table[hash];
struct hlist_head *head = &detail->hash_table[hash];
struct cache_head *tmp;

read_lock(&detail->hash_lock);

Expand All @@ -75,7 +73,15 @@ struct cache_head *sunrpc_cache_lookup(struct cache_detail *detail,
}
}
read_unlock(&detail->hash_lock);
/* Didn't find anything, insert an empty entry */
return NULL;
}

static struct cache_head *sunrpc_cache_add_entry(struct cache_detail *detail,
struct cache_head *key,
int hash)
{
struct cache_head *new, *tmp, *freeme = NULL;
struct hlist_head *head = &detail->hash_table[hash];

new = detail->alloc();
if (!new)
Expand Down Expand Up @@ -114,8 +120,19 @@ struct cache_head *sunrpc_cache_lookup(struct cache_detail *detail,
cache_put(freeme, detail);
return new;
}
EXPORT_SYMBOL_GPL(sunrpc_cache_lookup);

struct cache_head *sunrpc_cache_lookup(struct cache_detail *detail,
struct cache_head *key, int hash)
{
struct cache_head *ret;

ret = sunrpc_cache_find(detail, key, hash);
if (ret)
return ret;
/* Didn't find anything, insert an empty entry */
return sunrpc_cache_add_entry(detail, key, hash);
}
EXPORT_SYMBOL_GPL(sunrpc_cache_lookup);

static void cache_dequeue(struct cache_detail *detail, struct cache_head *ch);

Expand Down

0 comments on commit b92a8fa

Please sign in to comment.