Skip to content

Commit 55a000f

Browse files
jtlaytonchucklever
authored andcommitted
sunrpc: rename sunrpc_cache_pipe_upcall() to sunrpc_cache_upcall()
Since it will soon also send an upcall via netlink, if configured. Signed-off-by: Jeff Layton <jlayton@kernel.org> Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
1 parent 1ed3df3 commit 55a000f

4 files changed

Lines changed: 7 additions & 7 deletions

File tree

fs/nfsd/export.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ static void expkey_put(struct kref *ref)
6464

6565
static int expkey_upcall(struct cache_detail *cd, struct cache_head *h)
6666
{
67-
return sunrpc_cache_pipe_upcall(cd, h);
67+
return sunrpc_cache_upcall(cd, h);
6868
}
6969

7070
static void expkey_request(struct cache_detail *cd,
@@ -388,7 +388,7 @@ static void svc_export_put(struct kref *ref)
388388

389389
static int svc_export_upcall(struct cache_detail *cd, struct cache_head *h)
390390
{
391-
return sunrpc_cache_pipe_upcall(cd, h);
391+
return sunrpc_cache_upcall(cd, h);
392392
}
393393

394394
static void svc_export_request(struct cache_detail *cd,

include/linux/sunrpc/cache.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ sunrpc_cache_update(struct cache_detail *detail,
189189
struct cache_head *new, struct cache_head *old, int hash);
190190

191191
extern int
192-
sunrpc_cache_pipe_upcall(struct cache_detail *detail, struct cache_head *h);
192+
sunrpc_cache_upcall(struct cache_detail *detail, struct cache_head *h);
193193
extern int
194194
sunrpc_cache_pipe_upcall_timeout(struct cache_detail *detail,
195195
struct cache_head *h);

net/sunrpc/cache.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1241,13 +1241,13 @@ static int cache_pipe_upcall(struct cache_detail *detail, struct cache_head *h)
12411241
return ret;
12421242
}
12431243

1244-
int sunrpc_cache_pipe_upcall(struct cache_detail *detail, struct cache_head *h)
1244+
int sunrpc_cache_upcall(struct cache_detail *detail, struct cache_head *h)
12451245
{
12461246
if (test_and_set_bit(CACHE_PENDING, &h->flags))
12471247
return 0;
12481248
return cache_pipe_upcall(detail, h);
12491249
}
1250-
EXPORT_SYMBOL_GPL(sunrpc_cache_pipe_upcall);
1250+
EXPORT_SYMBOL_GPL(sunrpc_cache_upcall);
12511251

12521252
int sunrpc_cache_pipe_upcall_timeout(struct cache_detail *detail,
12531253
struct cache_head *h)
@@ -1257,7 +1257,7 @@ int sunrpc_cache_pipe_upcall_timeout(struct cache_detail *detail,
12571257
trace_cache_entry_no_listener(detail, h);
12581258
return -EINVAL;
12591259
}
1260-
return sunrpc_cache_pipe_upcall(detail, h);
1260+
return sunrpc_cache_upcall(detail, h);
12611261
}
12621262
EXPORT_SYMBOL_GPL(sunrpc_cache_pipe_upcall_timeout);
12631263

net/sunrpc/svcauth_unix.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ static struct cache_head *ip_map_alloc(void)
152152

153153
static int ip_map_upcall(struct cache_detail *cd, struct cache_head *h)
154154
{
155-
return sunrpc_cache_pipe_upcall(cd, h);
155+
return sunrpc_cache_upcall(cd, h);
156156
}
157157

158158
static void ip_map_request(struct cache_detail *cd,

0 commit comments

Comments
 (0)