From 727cf93c57285e38ab3ea9461f326bc65e10b968 Mon Sep 17 00:00:00 2001 From: Russell King Date: Fri, 16 Nov 2007 22:13:24 +0000 Subject: [PATCH] --- yaml --- r: 74174 b: refs/heads/master c: f16c960332b125491178fc2da7ea7893b0d65d05 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/nfs/super.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 5270bec69b68..de2951b37bfa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cfcb43ff7ce28f347a39e1a7519e01850b588718 +refs/heads/master: f16c960332b125491178fc2da7ea7893b0d65d05 diff --git a/trunk/fs/nfs/super.c b/trunk/fs/nfs/super.c index 71067d1ac9d9..2426e713b77f 100644 --- a/trunk/fs/nfs/super.c +++ b/trunk/fs/nfs/super.c @@ -1054,10 +1054,11 @@ static int nfs_validate_mount_data(void *options, { struct nfs_mount_data *data = (struct nfs_mount_data *)options; + memset(args, 0, sizeof(*args)); + if (data == NULL) goto out_no_data; - memset(args, 0, sizeof(*args)); args->flags = (NFS_MOUNT_VER3 | NFS_MOUNT_TCP); args->rsize = NFS_MAX_FILE_IO_SIZE; args->wsize = NFS_MAX_FILE_IO_SIZE; @@ -1536,10 +1537,11 @@ static int nfs4_validate_mount_data(void *options, struct nfs4_mount_data *data = (struct nfs4_mount_data *)options; char *c; + memset(args, 0, sizeof(*args)); + if (data == NULL) goto out_no_data; - memset(args, 0, sizeof(*args)); args->rsize = NFS_MAX_FILE_IO_SIZE; args->wsize = NFS_MAX_FILE_IO_SIZE; args->timeo = 600;