Clean up: remove any temporary "void *" casts we added while introducing
IPv6 support to the NFS client.
Signed-off-by: Chuck Lever <[email protected]>
---
fs/nfs/super.c | 17 +++++++----------
1 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index 10bdf3c..642d167 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -969,7 +969,7 @@ static int nfs_parse_mount_options(char *raw,
string = match_strdup(args);
if (string == NULL)
goto out_nomem;
- nfs_parse_server_address(string, (void *)
+ nfs_parse_server_address(string,
&mnt->nfs_server.address);
kfree(string);
break;
@@ -989,7 +989,7 @@ static int nfs_parse_mount_options(char *raw,
string = match_strdup(args);
if (string == NULL)
goto out_nomem;
- nfs_parse_server_address(string, (void *)
+ nfs_parse_server_address(string,
&mnt->mount_server.address);
kfree(string);
break;
@@ -1185,8 +1185,7 @@ static int nfs_validate_mount_data(void *options,
if (nfs_parse_mount_options((char *)options, args) == 0)
return -EINVAL;
- if (!nfs_verify_server_address((void *)
- &args->nfs_server.address))
+ if (!nfs_verify_server_address(&args->nfs_server.address))
goto out_no_address;
c = strchr(dev_name, ':');
@@ -1667,11 +1666,10 @@ static int nfs4_validate_mount_data(void *options,
goto out_no_address;
if (copy_from_user(ap, data->host_addr, data->host_addrlen))
return -EFAULT;
- if (!nfs_verify_server_address((void *)
- &args->nfs_server.address))
+ if (!nfs_verify_server_address(&args->nfs_server.address))
goto out_no_address;
- nfs4_default_port((void *)&args->nfs_server.address);
+ nfs4_default_port(&args->nfs_server.address);
switch (data->auth_flavourlen) {
case 0:
@@ -1726,11 +1724,10 @@ static int nfs4_validate_mount_data(void *options,
if (nfs_parse_mount_options((char *)options, args) == 0)
return -EINVAL;
- if (!nfs_verify_server_address((void *)
- &args->nfs_server.address))
+ if (!nfs_verify_server_address(&args->nfs_server.address))
return -EINVAL;
- nfs4_default_port((void *)&args->nfs_server.address);
+ nfs4_default_port(&args->nfs_server.address);
switch (args->auth_flavor_len) {
case 0:
-------------------------------------------------------------------------
SF.Net email is sponsored by: The Future of Linux Business White Paper
from Novell. From the desktop to the data center, Linux is going
mainstream. Let it simplify your IT future.
http://altfarm.mediaplex.com/ad/ck/8857-50307-18918-4
_______________________________________________
NFS maillist - [email protected]
https://lists.sourceforge.net/lists/listinfo/nfs
_______________________________________________
Please note that [email protected] is being discontinued.
Please subscribe to [email protected] instead.
http://vger.kernel.org/vger-lists.html#linux-nfs