Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9423a08a authored by Chuck Lever's avatar Chuck Lever Committed by Trond Myklebust
Browse files

NFS: Add nfs_alloc_parsed_mount_data 



Allocating nfs_parsed_mount_data and setting up the defaults is nearly
the same for both nfs and nfs4 mounts.

Both paths seem to use nfs_validate_transport_protocol(), so setting a
default value for nfs_server.protocol ought to be unnecessary.

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 61d0a8e6

fs/nfs/super.c

+23 −27
Original line number Diff line number Diff line
@@ -728,6 +728,27 @@ static void nfs_umount_begin(struct super_block *sb) 
	unlock_kernel();

}



static struct nfs_parsed_mount_data *nfs_alloc_parsed_mount_data(int flags)

{

	struct nfs_parsed_mount_data *data;



	data = kzalloc(sizeof(*data), GFP_KERNEL);

	if (data) {

		data->flags		= flags;

		data->rsize		= NFS_MAX_FILE_IO_SIZE;

		data->wsize		= NFS_MAX_FILE_IO_SIZE;

		data->acregmin		= NFS_DEF_ACREGMIN;

		data->acregmax		= NFS_DEF_ACREGMAX;

		data->acdirmin		= NFS_DEF_ACDIRMIN;

		data->acdirmax		= NFS_DEF_ACDIRMAX;

		data->nfs_server.port	= NFS_UNSPEC_PORT;

		data->auth_flavors[0]	= RPC_AUTH_UNIX;

		data->auth_flavor_len	= 1;

		data->minorversion	= 0;

	}

	return data;

}



/*

 * Sanity-check a server address provided by the mount command.

 *
@@ -1637,20 +1658,6 @@ static int nfs_validate_mount_data(void *options, 
	if (data == NULL)

		goto out_no_data;



	args->flags		= (NFS_MOUNT_VER3 | NFS_MOUNT_TCP);

	args->rsize		= NFS_MAX_FILE_IO_SIZE;

	args->wsize		= NFS_MAX_FILE_IO_SIZE;

	args->acregmin		= NFS_DEF_ACREGMIN;

	args->acregmax		= NFS_DEF_ACREGMAX;

	args->acdirmin		= NFS_DEF_ACDIRMIN;

	args->acdirmax		= NFS_DEF_ACDIRMAX;

	args->mount_server.port	= NFS_UNSPEC_PORT;

	args->nfs_server.port	= NFS_UNSPEC_PORT;

	args->nfs_server.protocol = XPRT_TRANSPORT_TCP;

	args->auth_flavors[0]	= RPC_AUTH_UNIX;

	args->auth_flavor_len	= 1;

	args->minorversion	= 0;



	switch (data->version) {

	case 1:

		data->namlen = 0;
@@ -2097,7 +2104,7 @@ static int nfs_get_sb(struct file_system_type *fs_type, 
	};

	int error = -ENOMEM;



	data = kzalloc(sizeof(*data), GFP_KERNEL);

	data = nfs_alloc_parsed_mount_data(NFS_MOUNT_VER3 | NFS_MOUNT_TCP);

	mntfh = kzalloc(sizeof(*mntfh), GFP_KERNEL);

	if (data == NULL || mntfh == NULL)

		goto out_free_fh;
@@ -2365,18 +2372,7 @@ static int nfs4_validate_mount_data(void *options, 
	if (data == NULL)

		goto out_no_data;



	args->rsize		= NFS_MAX_FILE_IO_SIZE;

	args->wsize		= NFS_MAX_FILE_IO_SIZE;

	args->acregmin		= NFS_DEF_ACREGMIN;

	args->acregmax		= NFS_DEF_ACREGMAX;

	args->acdirmin		= NFS_DEF_ACDIRMIN;

	args->acdirmax		= NFS_DEF_ACDIRMAX;

	args->nfs_server.port	= NFS_UNSPEC_PORT;

	args->auth_flavors[0]	= RPC_AUTH_UNIX;

	args->auth_flavor_len	= 1;

	args->version		= 4;

	args->minorversion	= 0;



	switch (data->version) {

	case 1:

		if (data->host_addrlen > sizeof(args->nfs_server.address))
@@ -2659,7 +2655,7 @@ static int nfs4_get_sb(struct file_system_type *fs_type, 
	struct nfs_parsed_mount_data *data;

	int error = -ENOMEM;



	data = kzalloc(sizeof(*data), GFP_KERNEL);

	data = nfs_alloc_parsed_mount_data(0);

	if (data == NULL)

		goto out_free_data;