diff options
| -rw-r--r-- | fs/nfs/super.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/nfs/super.c b/fs/nfs/super.c index 71067d1ac9d9..2426e713b77f 100644 --- a/fs/nfs/super.c +++ b/fs/nfs/super.c | |||
| @@ -1054,10 +1054,11 @@ static int nfs_validate_mount_data(void *options, | |||
| 1054 | { | 1054 | { |
| 1055 | struct nfs_mount_data *data = (struct nfs_mount_data *)options; | 1055 | struct nfs_mount_data *data = (struct nfs_mount_data *)options; |
| 1056 | 1056 | ||
| 1057 | memset(args, 0, sizeof(*args)); | ||
| 1058 | |||
| 1057 | if (data == NULL) | 1059 | if (data == NULL) |
| 1058 | goto out_no_data; | 1060 | goto out_no_data; |
| 1059 | 1061 | ||
| 1060 | memset(args, 0, sizeof(*args)); | ||
| 1061 | args->flags = (NFS_MOUNT_VER3 | NFS_MOUNT_TCP); | 1062 | args->flags = (NFS_MOUNT_VER3 | NFS_MOUNT_TCP); |
| 1062 | args->rsize = NFS_MAX_FILE_IO_SIZE; | 1063 | args->rsize = NFS_MAX_FILE_IO_SIZE; |
| 1063 | args->wsize = NFS_MAX_FILE_IO_SIZE; | 1064 | args->wsize = NFS_MAX_FILE_IO_SIZE; |
| @@ -1536,10 +1537,11 @@ static int nfs4_validate_mount_data(void *options, | |||
| 1536 | struct nfs4_mount_data *data = (struct nfs4_mount_data *)options; | 1537 | struct nfs4_mount_data *data = (struct nfs4_mount_data *)options; |
| 1537 | char *c; | 1538 | char *c; |
| 1538 | 1539 | ||
| 1540 | memset(args, 0, sizeof(*args)); | ||
| 1541 | |||
| 1539 | if (data == NULL) | 1542 | if (data == NULL) |
| 1540 | goto out_no_data; | 1543 | goto out_no_data; |
| 1541 | 1544 | ||
| 1542 | memset(args, 0, sizeof(*args)); | ||
| 1543 | args->rsize = NFS_MAX_FILE_IO_SIZE; | 1545 | args->rsize = NFS_MAX_FILE_IO_SIZE; |
| 1544 | args->wsize = NFS_MAX_FILE_IO_SIZE; | 1546 | args->wsize = NFS_MAX_FILE_IO_SIZE; |
| 1545 | args->timeo = 600; | 1547 | args->timeo = 600; |
