leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SUNRPC: remove "cache_request" argument in sunrpc_cache_pipe_upcall() function

Browse Source 
Passing this pointer is redundant since it's stored on cache_detail structure,
which is also passed to sunrpc_cache_pipe_upcall () function.

Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
This commit is contained in:
Stanislav Kinsbursky 2013-02-04 14:02:55 +03:00 committed by J. Bruce Fields
parent 2d4383383b
commit 21cd1254d3
3 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/nfs/dns_resolve.c
View File

@ -144,7 +144,7 @@ static int nfs_dns_upcall(struct cache_detail *cd,
ret = nfs_cache_upcall(cd, key->hostname); ret = nfs_cache_upcall(cd, key->hostname);
if (ret) if (ret)
ret = sunrpc_cache_pipe_upcall(cd, ch, cd->cache_request); ret = sunrpc_cache_pipe_upcall(cd, ch);
return ret; return ret;
} }

6
include/linux/sunrpc/cache.h
View File

@ -161,11 +161,7 @@ sunrpc_cache_update(struct cache_detail *detail,
struct cache_head *new, struct cache_head *old, int hash); struct cache_head *new, struct cache_head *old, int hash);
extern int extern int
sunrpc_cache_pipe_upcall(struct cache_detail *detail, struct cache_head *h, sunrpc_cache_pipe_upcall(struct cache_detail *detail, struct cache_head *h);
void (*cache_request)(struct cache_detail *,
struct cache_head *,
char **,
int *));
extern void cache_clean_deferred(void *owner); extern void cache_clean_deferred(void *owner);

10
net/sunrpc/cache.c
View File

@ -198,7 +198,7 @@ static int cache_make_upcall(struct cache_detail *cd, struct cache_head *h)
{ {
if (cd->cache_upcall) if (cd->cache_upcall)
return cd->cache_upcall(cd, h); return cd->cache_upcall(cd, h);
return sunrpc_cache_pipe_upcall(cd, h, cd->cache_request); return sunrpc_cache_pipe_upcall(cd, h);
} }
static inline int cache_is_valid(struct cache_detail *detail, struct cache_head *h) static inline int cache_is_valid(struct cache_detail *detail, struct cache_head *h)
@ -1140,11 +1140,7 @@ static bool cache_listeners_exist(struct cache_detail *detail)
* *
* Each request is at most one page long. * Each request is at most one page long.
*/ */
int sunrpc_cache_pipe_upcall(struct cache_detail *detail, struct cache_head *h, int sunrpc_cache_pipe_upcall(struct cache_detail *detail, struct cache_head *h)
void (*cache_request)(struct cache_detail *,
struct cache_head *,
char **,
int *))
{ {
char *buf; char *buf;
@ -1172,7 +1168,7 @@ int sunrpc_cache_pipe_upcall(struct cache_detail *detail, struct cache_head *h,
bp = buf; len = PAGE_SIZE; bp = buf; len = PAGE_SIZE;
cache_request(detail, h, &bp, &len); detail->cache_request(detail, h, &bp, &len);
if (len < 0) { if (len < 0) {
kfree(buf); kfree(buf);