From 32620adbec19c80c2bafbbda5a9d33cc3a8eb0f1 Mon Sep 17 00:00:00 2001 From: Bryan Schumaker Date: Thu, 10 May 2012 15:07:38 -0400 Subject: [PATCH] --- yaml --- r: 308606 b: refs/heads/master c: db8333519187d5974cf2ff33910c893bf8727d9f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/nfs/super.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 39354496731f..c2aa21c50123 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 21e4b82e13c038457b4fa4d54d988c9f1865bcf6 +refs/heads/master: db8333519187d5974cf2ff33910c893bf8727d9f diff --git a/trunk/fs/nfs/super.c b/trunk/fs/nfs/super.c index 1157189b4d49..db0952de67d9 100644 --- a/trunk/fs/nfs/super.c +++ b/trunk/fs/nfs/super.c @@ -945,7 +945,7 @@ static void nfs_umount_begin(struct super_block *sb) rpc_killall_tasks(rpc); } -static struct nfs_parsed_mount_data *nfs_alloc_parsed_mount_data(unsigned int version) +static struct nfs_parsed_mount_data *nfs_alloc_parsed_mount_data(void) { struct nfs_parsed_mount_data *data; @@ -960,7 +960,6 @@ static struct nfs_parsed_mount_data *nfs_alloc_parsed_mount_data(unsigned int ve data->nfs_server.protocol = XPRT_TRANSPORT_TCP; data->auth_flavors[0] = RPC_AUTH_UNIX; data->auth_flavor_len = 1; - data->version = version; data->minorversion = 0; data->net = current->nsproxy->net_ns; security_init_mnt_opts(&data->lsm_opts); @@ -2416,7 +2415,7 @@ static struct dentry *nfs_fs_mount(struct file_system_type *fs_type, struct dentry *mntroot = ERR_PTR(-ENOMEM); int error; - data = nfs_alloc_parsed_mount_data(NFS_DEFAULT_VERSION); + data = nfs_alloc_parsed_mount_data(); mntfh = nfs_alloc_fhandle(); if (data == NULL || mntfh == NULL) goto out; @@ -2867,7 +2866,7 @@ static struct dentry *nfs4_mount(struct file_system_type *fs_type, int error = -ENOMEM; struct dentry *res = ERR_PTR(-ENOMEM); - data = nfs_alloc_parsed_mount_data(4); + data = nfs_alloc_parsed_mount_data(); if (data == NULL) goto out;