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

Commit d75e265b authored by Amir Shehata's avatar Amir Shehata Committed by Greg Kroah-Hartman
Browse files

staging/lustre/lnet: coding style fix for lst_test_add_ioctl 

To make the function a bit easier to read.

This is coding style fix part of original Lustre commit in external tree.

Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-3093
Lustre-change: http://review.whamcloud.com/6092


Signed-off-by: default avatarAmir Shehata <amir.shehata@intel.com>
Reviewed-by: default avatarIsaac Huang <he.huang@intel.com>
Reviewed-by: default avatarLiang Zhen <liang.zhen@intel.com>
Reviewed-by: default avatarOleg Drokin <oleg.drokin@intel.com>
Signed-off-by: default avatarPeng Tao <bergwolf@gmail.com>
Signed-off-by: default avatarAndreas Dilger <andreas.dilger@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d298b537

drivers/staging/lustre/lnet/selftest/conctl.c

+27 −29
Original line number Diff line number Diff line
@@ -723,9 +723,9 @@ lst_stat_query_ioctl(lstio_stat_args_t *args) 


int lst_test_add_ioctl(lstio_test_args_t *args)

{

	char	   *name;

	char	   *srcgrp = NULL;

	char	   *dstgrp = NULL;

	char		*batch_name;

	char		*src_name = NULL;

	char		*dst_name = NULL;

	void		*param = NULL;

	int		ret = 0;

	int		rc = -ENOMEM;
@@ -755,16 +755,16 @@ int lst_test_add_ioctl(lstio_test_args_t *args) 
	     args->lstio_tes_param_len > PAGE_CACHE_SIZE - sizeof(lstcon_test_t)))

		return -EINVAL;



	LIBCFS_ALLOC(name, args->lstio_tes_bat_nmlen + 1);

	if (name == NULL)

	LIBCFS_ALLOC(batch_name, args->lstio_tes_bat_nmlen + 1);

	if (batch_name == NULL)

		return rc;



	LIBCFS_ALLOC(srcgrp, args->lstio_tes_sgrp_nmlen + 1);

	if (srcgrp == NULL)

	LIBCFS_ALLOC(src_name, args->lstio_tes_sgrp_nmlen + 1);

	if (src_name == NULL)

		goto out;



	LIBCFS_ALLOC(dstgrp, args->lstio_tes_dgrp_nmlen + 1);

	 if (dstgrp == NULL)

	LIBCFS_ALLOC(dst_name, args->lstio_tes_dgrp_nmlen + 1);

	 if (dst_name == NULL)

		goto out;



	if (args->lstio_tes_param != NULL) {
@@ -774,39 +774,37 @@ int lst_test_add_ioctl(lstio_test_args_t *args) 
	}



	rc = -EFAULT;

	if (copy_from_user(name,

			      args->lstio_tes_bat_name,

	if (copy_from_user(batch_name, args->lstio_tes_bat_name,

			   args->lstio_tes_bat_nmlen) ||

	    copy_from_user(srcgrp,

			      args->lstio_tes_sgrp_name,

	    copy_from_user(src_name, args->lstio_tes_sgrp_name,

			   args->lstio_tes_sgrp_nmlen) ||

	    copy_from_user(dstgrp,

			      args->lstio_tes_dgrp_name,

	    copy_from_user(dst_name, args->lstio_tes_dgrp_name,

			   args->lstio_tes_dgrp_nmlen) ||

	    copy_from_user(param, args->lstio_tes_param,

			      args->lstio_tes_param_len))

		goto out;



	rc = lstcon_test_add(name,

	rc = lstcon_test_add(batch_name,

			    args->lstio_tes_type,

			    args->lstio_tes_loop,

			    args->lstio_tes_concur,

			    args->lstio_tes_dist, args->lstio_tes_span,

			    srcgrp, dstgrp, param, args->lstio_tes_param_len,

			    src_name, dst_name, param,

			    args->lstio_tes_param_len,

			    &ret, args->lstio_tes_resultp);



	if (ret != 0)

		rc = (copy_to_user(args->lstio_tes_retp, &ret,

				       sizeof(ret))) ? -EFAULT : 0;

out:

	if (name != NULL)

		LIBCFS_FREE(name, args->lstio_tes_bat_nmlen + 1);

	if (batch_name != NULL)

		LIBCFS_FREE(batch_name, args->lstio_tes_bat_nmlen + 1);



	if (srcgrp != NULL)

		LIBCFS_FREE(srcgrp, args->lstio_tes_sgrp_nmlen + 1);

	if (src_name != NULL)

		LIBCFS_FREE(src_name, args->lstio_tes_sgrp_nmlen + 1);



	if (dstgrp != NULL)

		LIBCFS_FREE(dstgrp, args->lstio_tes_dgrp_nmlen + 1);

	if (dst_name != NULL)

		LIBCFS_FREE(dst_name, args->lstio_tes_dgrp_nmlen + 1);



	if (param != NULL)

		LIBCFS_FREE(param, args->lstio_tes_param_len);