Commit b046ccdc authored by Chuck Lever's avatar Chuck Lever Committed by J. Bruce Fields

NFSD: clean up failover sysctl function naming

Clean up: Rename recently-added failover functions to match the naming
convention in fs/nfsd/nfsctl.c.
Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
parent b064ec03
...@@ -84,6 +84,8 @@ static ssize_t write_unexport(struct file *file, char *buf, size_t size); ...@@ -84,6 +84,8 @@ static ssize_t write_unexport(struct file *file, char *buf, size_t size);
static ssize_t write_getfd(struct file *file, char *buf, size_t size); static ssize_t write_getfd(struct file *file, char *buf, size_t size);
static ssize_t write_getfs(struct file *file, char *buf, size_t size); static ssize_t write_getfs(struct file *file, char *buf, size_t size);
static ssize_t write_filehandle(struct file *file, char *buf, size_t size); static ssize_t write_filehandle(struct file *file, char *buf, size_t size);
static ssize_t write_unlock_ip(struct file *file, char *buf, size_t size);
static ssize_t write_unlock_fs(struct file *file, char *buf, size_t size);
static ssize_t write_threads(struct file *file, char *buf, size_t size); static ssize_t write_threads(struct file *file, char *buf, size_t size);
static ssize_t write_pool_threads(struct file *file, char *buf, size_t size); static ssize_t write_pool_threads(struct file *file, char *buf, size_t size);
static ssize_t write_versions(struct file *file, char *buf, size_t size); static ssize_t write_versions(struct file *file, char *buf, size_t size);
...@@ -94,9 +96,6 @@ static ssize_t write_leasetime(struct file *file, char *buf, size_t size); ...@@ -94,9 +96,6 @@ static ssize_t write_leasetime(struct file *file, char *buf, size_t size);
static ssize_t write_recoverydir(struct file *file, char *buf, size_t size); static ssize_t write_recoverydir(struct file *file, char *buf, size_t size);
#endif #endif
static ssize_t failover_unlock_ip(struct file *file, char *buf, size_t size);
static ssize_t failover_unlock_fs(struct file *file, char *buf, size_t size);
static ssize_t (*write_op[])(struct file *, char *, size_t) = { static ssize_t (*write_op[])(struct file *, char *, size_t) = {
[NFSD_Svc] = write_svc, [NFSD_Svc] = write_svc,
[NFSD_Add] = write_add, [NFSD_Add] = write_add,
...@@ -106,8 +105,8 @@ static ssize_t (*write_op[])(struct file *, char *, size_t) = { ...@@ -106,8 +105,8 @@ static ssize_t (*write_op[])(struct file *, char *, size_t) = {
[NFSD_Getfd] = write_getfd, [NFSD_Getfd] = write_getfd,
[NFSD_Getfs] = write_getfs, [NFSD_Getfs] = write_getfs,
[NFSD_Fh] = write_filehandle, [NFSD_Fh] = write_filehandle,
[NFSD_FO_UnlockIP] = failover_unlock_ip, [NFSD_FO_UnlockIP] = write_unlock_ip,
[NFSD_FO_UnlockFS] = failover_unlock_fs, [NFSD_FO_UnlockFS] = write_unlock_fs,
[NFSD_Threads] = write_threads, [NFSD_Threads] = write_threads,
[NFSD_Pool_Threads] = write_pool_threads, [NFSD_Pool_Threads] = write_pool_threads,
[NFSD_Versions] = write_versions, [NFSD_Versions] = write_versions,
...@@ -309,7 +308,7 @@ static ssize_t write_getfd(struct file *file, char *buf, size_t size) ...@@ -309,7 +308,7 @@ static ssize_t write_getfd(struct file *file, char *buf, size_t size)
return err; return err;
} }
static ssize_t failover_unlock_ip(struct file *file, char *buf, size_t size) static ssize_t write_unlock_ip(struct file *file, char *buf, size_t size)
{ {
struct sockaddr_in sin = { struct sockaddr_in sin = {
.sin_family = AF_INET, .sin_family = AF_INET,
...@@ -339,7 +338,7 @@ static ssize_t failover_unlock_ip(struct file *file, char *buf, size_t size) ...@@ -339,7 +338,7 @@ static ssize_t failover_unlock_ip(struct file *file, char *buf, size_t size)
return nlmsvc_unlock_all_by_ip((struct sockaddr *)&sin); return nlmsvc_unlock_all_by_ip((struct sockaddr *)&sin);
} }
static ssize_t failover_unlock_fs(struct file *file, char *buf, size_t size) static ssize_t write_unlock_fs(struct file *file, char *buf, size_t size)
{ {
struct path path; struct path path;
char *fo_path; char *fo_path;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment