Skip to content

Commit b2c217e

Browse files
jtlaytonchucklever
authored andcommitted
sunrpc: rename sunrpc_cache_pipe_upcall_timeout()
This function doesn't have anything to do with a timeout. The only difference is that it warns if there are no listeners. Rename it to sunrpc_cache_upcall_warn(). Signed-off-by: Jeff Layton <jlayton@kernel.org> Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
1 parent 55a000f commit b2c217e

6 files changed

Lines changed: 9 additions & 9 deletions

File tree

fs/nfs/dns_resolve.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ static int nfs_dns_upcall(struct cache_detail *cd,
156156
if (!nfs_cache_upcall(cd, key->hostname))
157157
return 0;
158158
clear_bit(CACHE_PENDING, &ch->flags);
159-
return sunrpc_cache_pipe_upcall_timeout(cd, ch);
159+
return sunrpc_cache_upcall_warn(cd, ch);
160160
}
161161

162162
static int nfs_dns_match(struct cache_head *ca,

fs/nfsd/nfs4idmap.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ idtoname_hash(struct ent *ent)
126126
static int
127127
idtoname_upcall(struct cache_detail *cd, struct cache_head *h)
128128
{
129-
return sunrpc_cache_pipe_upcall_timeout(cd, h);
129+
return sunrpc_cache_upcall_warn(cd, h);
130130
}
131131

132132
static void
@@ -306,7 +306,7 @@ nametoid_hash(struct ent *ent)
306306
static int
307307
nametoid_upcall(struct cache_detail *cd, struct cache_head *h)
308308
{
309-
return sunrpc_cache_pipe_upcall_timeout(cd, h);
309+
return sunrpc_cache_upcall_warn(cd, h);
310310
}
311311

312312
static void

include/linux/sunrpc/cache.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ sunrpc_cache_update(struct cache_detail *detail,
191191
extern int
192192
sunrpc_cache_upcall(struct cache_detail *detail, struct cache_head *h);
193193
extern int
194-
sunrpc_cache_pipe_upcall_timeout(struct cache_detail *detail,
194+
sunrpc_cache_upcall_warn(struct cache_detail *detail,
195195
struct cache_head *h);
196196

197197

net/sunrpc/auth_gss/svcauth_gss.c

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

207207
static int rsi_upcall(struct cache_detail *cd, struct cache_head *h)
208208
{
209-
return sunrpc_cache_pipe_upcall_timeout(cd, h);
209+
return sunrpc_cache_upcall_warn(cd, h);
210210
}
211211

212212
static void rsi_request(struct cache_detail *cd,

net/sunrpc/cache.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1249,8 +1249,8 @@ int sunrpc_cache_upcall(struct cache_detail *detail, struct cache_head *h)
12491249
}
12501250
EXPORT_SYMBOL_GPL(sunrpc_cache_upcall);
12511251

1252-
int sunrpc_cache_pipe_upcall_timeout(struct cache_detail *detail,
1253-
struct cache_head *h)
1252+
int sunrpc_cache_upcall_warn(struct cache_detail *detail,
1253+
struct cache_head *h)
12541254
{
12551255
if (!cache_listeners_exist(detail)) {
12561256
warn_no_listener(detail);
@@ -1259,7 +1259,7 @@ int sunrpc_cache_pipe_upcall_timeout(struct cache_detail *detail,
12591259
}
12601260
return sunrpc_cache_upcall(detail, h);
12611261
}
1262-
EXPORT_SYMBOL_GPL(sunrpc_cache_pipe_upcall_timeout);
1262+
EXPORT_SYMBOL_GPL(sunrpc_cache_upcall_warn);
12631263

12641264
/*
12651265
* parse a message from user-space and pass it

net/sunrpc/svcauth_unix.c

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

468468
static int unix_gid_upcall(struct cache_detail *cd, struct cache_head *h)
469469
{
470-
return sunrpc_cache_pipe_upcall_timeout(cd, h);
470+
return sunrpc_cache_upcall_warn(cd, h);
471471
}
472472

473473
static void unix_gid_request(struct cache_detail *cd,

0 commit comments

Comments
 (0)