diff options
Diffstat (limited to 'fs/lockd/mon.c')
-rw-r--r-- | fs/lockd/mon.c | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/fs/lockd/mon.c b/fs/lockd/mon.c index e46903995c99..740702216042 100644 --- a/fs/lockd/mon.c +++ b/fs/lockd/mon.c | |||
@@ -240,24 +240,22 @@ static void nsm_init_private(struct nsm_handle *nsm) | |||
240 | } | 240 | } |
241 | 241 | ||
242 | /** | 242 | /** |
243 | * nsm_find - Find or create a cached nsm_handle | 243 | * nsm_get_handle - Find or create a cached nsm_handle |
244 | * @sap: pointer to socket address of handle to find | 244 | * @sap: pointer to socket address of handle to find |
245 | * @salen: length of socket address | 245 | * @salen: length of socket address |
246 | * @hostname: pointer to C string containing hostname to find | 246 | * @hostname: pointer to C string containing hostname to find |
247 | * @hostname_len: length of C string | 247 | * @hostname_len: length of C string |
248 | * @create: one means create new handle if not found in cache | ||
249 | * | 248 | * |
250 | * Behavior is modulated by the global nsm_use_hostnames variable | 249 | * Behavior is modulated by the global nsm_use_hostnames variable. |
251 | * and by the @create argument. | ||
252 | * | 250 | * |
253 | * Returns a cached nsm_handle after bumping its ref count, or if | 251 | * Returns a cached nsm_handle after bumping its ref count, or |
254 | * @create is set, returns a fresh nsm_handle if a handle that | 252 | * returns a fresh nsm_handle if a handle that matches @sap and/or |
255 | * matches @sap and/or @hostname cannot be found in the handle cache. | 253 | * @hostname cannot be found in the handle cache. Returns NULL if |
256 | * Returns NULL if an error occurs. | 254 | * an error occurs. |
257 | */ | 255 | */ |
258 | struct nsm_handle *nsm_find(const struct sockaddr *sap, const size_t salen, | 256 | struct nsm_handle *nsm_get_handle(const struct sockaddr *sap, |
259 | const char *hostname, const size_t hostname_len, | 257 | const size_t salen, const char *hostname, |
260 | const int create) | 258 | const size_t hostname_len) |
261 | { | 259 | { |
262 | struct nsm_handle *nsm = NULL; | 260 | struct nsm_handle *nsm = NULL; |
263 | struct nsm_handle *pos; | 261 | struct nsm_handle *pos; |
@@ -297,9 +295,6 @@ retry: | |||
297 | } | 295 | } |
298 | spin_unlock(&nsm_lock); | 296 | spin_unlock(&nsm_lock); |
299 | 297 | ||
300 | if (!create) | ||
301 | return NULL; | ||
302 | |||
303 | nsm = kzalloc(sizeof(*nsm) + hostname_len + 1, GFP_KERNEL); | 298 | nsm = kzalloc(sizeof(*nsm) + hostname_len + 1, GFP_KERNEL); |
304 | if (nsm == NULL) | 299 | if (nsm == NULL) |
305 | return NULL; | 300 | return NULL; |