Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 21cd1254 authored by Stanislav Kinsbursky's avatar Stanislav Kinsbursky Committed by J. Bruce Fields
Browse files

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



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: default avatarStanislav Kinsbursky <skinsbursky@parallels.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 2d438338

fs/nfs/dns_resolve.c

+1 −1
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ static int nfs_dns_upcall(struct cache_detail *cd, 


	ret = nfs_cache_upcall(cd, key->hostname);

	if (ret)

		ret = sunrpc_cache_pipe_upcall(cd, ch, cd->cache_request);

		ret = sunrpc_cache_pipe_upcall(cd, ch);

	return ret;

}

include/linux/sunrpc/cache.h

+1 −5
Original line number Diff line number Diff line
@@ -161,11 +161,7 @@ sunrpc_cache_update(struct cache_detail *detail, 
		    struct cache_head *new, struct cache_head *old, int hash);



extern int

sunrpc_cache_pipe_upcall(struct cache_detail *detail, struct cache_head *h,

		void (*cache_request)(struct cache_detail *,

				      struct cache_head *,

				      char **,

				      int *));

sunrpc_cache_pipe_upcall(struct cache_detail *detail, struct cache_head *h);





extern void cache_clean_deferred(void *owner);

net/sunrpc/cache.c

+3 −7
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ static int cache_make_upcall(struct cache_detail *cd, struct cache_head *h) 
{

	if (cd->cache_upcall)

		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)
@@ -1140,11 +1140,7 @@ static bool cache_listeners_exist(struct cache_detail *detail) 
 *

 * Each request is at most one page long.

 */

int sunrpc_cache_pipe_upcall(struct cache_detail *detail, struct cache_head *h,

		void (*cache_request)(struct cache_detail *,

				      struct cache_head *,

				      char **,

				      int *))

int sunrpc_cache_pipe_upcall(struct cache_detail *detail, struct cache_head *h)

{



	char *buf;
@@ -1172,7 +1168,7 @@ int sunrpc_cache_pipe_upcall(struct cache_detail *detail, struct cache_head *h, 


	bp = buf; len = PAGE_SIZE;



	cache_request(detail, h, &bp, &len);

	detail->cache_request(detail, h, &bp, &len);



	if (len < 0) {

		kfree(buf);