diff options
Diffstat (limited to 'fs/nfsd')
-rw-r--r-- | fs/nfsd/nfsctl.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c index 2c2eb8796c10..1955a2702e60 100644 --- a/fs/nfsd/nfsctl.c +++ b/fs/nfsd/nfsctl.c | |||
@@ -310,9 +310,12 @@ static ssize_t write_getfd(struct file *file, char *buf, size_t size) | |||
310 | 310 | ||
311 | static ssize_t failover_unlock_ip(struct file *file, char *buf, size_t size) | 311 | static ssize_t failover_unlock_ip(struct file *file, char *buf, size_t size) |
312 | { | 312 | { |
313 | __be32 server_ip; | 313 | struct sockaddr_in sin = { |
314 | char *fo_path, c; | 314 | .sin_family = AF_INET, |
315 | }; | ||
315 | int b1, b2, b3, b4; | 316 | int b1, b2, b3, b4; |
317 | char c; | ||
318 | char *fo_path; | ||
316 | 319 | ||
317 | /* sanity check */ | 320 | /* sanity check */ |
318 | if (size == 0) | 321 | if (size == 0) |
@@ -326,11 +329,13 @@ static ssize_t failover_unlock_ip(struct file *file, char *buf, size_t size) | |||
326 | return -EINVAL; | 329 | return -EINVAL; |
327 | 330 | ||
328 | /* get ipv4 address */ | 331 | /* get ipv4 address */ |
329 | if (sscanf(fo_path, "%u.%u.%u.%u%c", &b1, &b2, &b3, &b4, &c) != 4) | 332 | if (sscanf(fo_path, NIPQUAD_FMT "%c", &b1, &b2, &b3, &b4, &c) != 4) |
333 | return -EINVAL; | ||
334 | if (b1 > 255 || b2 > 255 || b3 > 255 || b4 > 255) | ||
330 | return -EINVAL; | 335 | return -EINVAL; |
331 | server_ip = htonl((((((b1<<8)|b2)<<8)|b3)<<8)|b4); | 336 | sin.sin_addr.s_addr = htonl((b1 << 24) | (b2 << 16) | (b3 << 8) | b4); |
332 | 337 | ||
333 | return nlmsvc_unlock_all_by_ip(server_ip); | 338 | return nlmsvc_unlock_all_by_ip((struct sockaddr *)&sin); |
334 | } | 339 | } |
335 | 340 | ||
336 | static ssize_t failover_unlock_fs(struct file *file, char *buf, size_t size) | 341 | static ssize_t failover_unlock_fs(struct file *file, char *buf, size_t size) |