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

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/6092Signed-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
...@@ -723,9 +723,9 @@ lst_stat_query_ioctl(lstio_stat_args_t *args) ...@@ -723,9 +723,9 @@ lst_stat_query_ioctl(lstio_stat_args_t *args)
int lst_test_add_ioctl(lstio_test_args_t *args) int lst_test_add_ioctl(lstio_test_args_t *args)
{ {
char *name; char *batch_name;
char *srcgrp = NULL; char *src_name = NULL;
char *dstgrp = NULL; char *dst_name = NULL;
void *param = NULL; void *param = NULL;
int ret = 0; int ret = 0;
int rc = -ENOMEM; int rc = -ENOMEM;
...@@ -755,16 +755,16 @@ int lst_test_add_ioctl(lstio_test_args_t *args) ...@@ -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))) args->lstio_tes_param_len > PAGE_CACHE_SIZE - sizeof(lstcon_test_t)))
return -EINVAL; return -EINVAL;
LIBCFS_ALLOC(name, args->lstio_tes_bat_nmlen + 1); LIBCFS_ALLOC(batch_name, args->lstio_tes_bat_nmlen + 1);
if (name == NULL) if (batch_name == NULL)
return rc; return rc;
LIBCFS_ALLOC(srcgrp, args->lstio_tes_sgrp_nmlen + 1); LIBCFS_ALLOC(src_name, args->lstio_tes_sgrp_nmlen + 1);
if (srcgrp == NULL) if (src_name == NULL)
goto out; goto out;
LIBCFS_ALLOC(dstgrp, args->lstio_tes_dgrp_nmlen + 1); LIBCFS_ALLOC(dst_name, args->lstio_tes_dgrp_nmlen + 1);
if (dstgrp == NULL) if (dst_name == NULL)
goto out; goto out;
if (args->lstio_tes_param != NULL) { if (args->lstio_tes_param != NULL) {
...@@ -774,39 +774,37 @@ int lst_test_add_ioctl(lstio_test_args_t *args) ...@@ -774,39 +774,37 @@ int lst_test_add_ioctl(lstio_test_args_t *args)
} }
rc = -EFAULT; rc = -EFAULT;
if (copy_from_user(name, if (copy_from_user(batch_name, args->lstio_tes_bat_name,
args->lstio_tes_bat_name,
args->lstio_tes_bat_nmlen) || args->lstio_tes_bat_nmlen) ||
copy_from_user(srcgrp, copy_from_user(src_name, args->lstio_tes_sgrp_name,
args->lstio_tes_sgrp_name,
args->lstio_tes_sgrp_nmlen) || args->lstio_tes_sgrp_nmlen) ||
copy_from_user(dstgrp, copy_from_user(dst_name, args->lstio_tes_dgrp_name,
args->lstio_tes_dgrp_name,
args->lstio_tes_dgrp_nmlen) || args->lstio_tes_dgrp_nmlen) ||
copy_from_user(param, args->lstio_tes_param, copy_from_user(param, args->lstio_tes_param,
args->lstio_tes_param_len)) args->lstio_tes_param_len))
goto out; goto out;
rc = lstcon_test_add(name, rc = lstcon_test_add(batch_name,
args->lstio_tes_type, args->lstio_tes_type,
args->lstio_tes_loop, args->lstio_tes_loop,
args->lstio_tes_concur, args->lstio_tes_concur,
args->lstio_tes_dist, args->lstio_tes_span, 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); &ret, args->lstio_tes_resultp);
if (ret != 0) if (ret != 0)
rc = (copy_to_user(args->lstio_tes_retp, &ret, rc = (copy_to_user(args->lstio_tes_retp, &ret,
sizeof(ret))) ? -EFAULT : 0; sizeof(ret))) ? -EFAULT : 0;
out: out:
if (name != NULL) if (batch_name != NULL)
LIBCFS_FREE(name, args->lstio_tes_bat_nmlen + 1); LIBCFS_FREE(batch_name, args->lstio_tes_bat_nmlen + 1);
if (srcgrp != NULL) if (src_name != NULL)
LIBCFS_FREE(srcgrp, args->lstio_tes_sgrp_nmlen + 1); LIBCFS_FREE(src_name, args->lstio_tes_sgrp_nmlen + 1);
if (dstgrp != NULL) if (dst_name != NULL)
LIBCFS_FREE(dstgrp, args->lstio_tes_dgrp_nmlen + 1); LIBCFS_FREE(dst_name, args->lstio_tes_dgrp_nmlen + 1);
if (param != NULL) if (param != NULL)
LIBCFS_FREE(param, args->lstio_tes_param_len); LIBCFS_FREE(param, args->lstio_tes_param_len);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment