Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1560108
| From | James Simmons <jsimmons@infradead.org> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH 07/34] staging: lustre: lnet: change lstcon_test_batch_ent_t to proper structure |
| Date | 2017-01-16 22:40 +0100 |
| Message-ID | <t0nas-6mU-83@gated-at.bofh.it> (permalink) |
| References | <t0nap-6mU-7@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
Change lstcon_test_batch_ent_t from typedef to proper structure.
Signed-off-by: James Simmons <uja.ornl@yahoo.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-6142
Reviewed-on: https://review.whamcloud.com/24188
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: Doug Oucharek <doug.s.oucharek@intel.com>
Signed-off-by: James Simmons <jsimmons@infradead.org>
---
drivers/staging/lustre/include/linux/lnet/lnetst.h | 6 +++---
drivers/staging/lustre/lnet/selftest/console.c | 10 +++++-----
drivers/staging/lustre/lnet/selftest/console.h | 2 +-
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/staging/lustre/include/linux/lnet/lnetst.h b/drivers/staging/lustre/include/linux/lnet/lnetst.h
index f2b98e9..adc03fe 100644
--- a/drivers/staging/lustre/include/linux/lnet/lnetst.h
+++ b/drivers/staging/lustre/include/linux/lnet/lnetst.h
@@ -112,7 +112,7 @@ struct lstcon_batch_ent {
}; /*** batch summary entry, for
*** list_batch command */
-typedef struct {
+struct lstcon_test_batch_ent {
struct lstcon_ndlist_ent tbe_cli_nle; /* client (group) node_list
* entry */
struct lstcon_ndlist_ent tbe_srv_nle; /* server (group) node_list
@@ -121,7 +121,7 @@ struct lstcon_batch_ent {
struct lstcon_test_ent tbe_test; /* test entry */
struct lstcon_batch_ent tbe_batch;/* batch entry */
} u;
-} lstcon_test_batch_ent_t; /*** test/batch verbose information entry,
+}; /*** test/batch verbose information entry,
*** for list_batch command */
typedef struct {
@@ -413,7 +413,7 @@ struct lstcon_batch_ent {
int lstio_bat_server; /* IN: query server
or not */
int lstio_bat_testidx; /* IN: test index */
- lstcon_test_batch_ent_t __user *lstio_bat_entp; /* OUT: batch ent */
+ struct lstcon_test_batch_ent __user *lstio_bat_entp;/* OUT: batch ent */
int __user *lstio_bat_idxp; /* IN/OUT: index of node */
int __user *lstio_bat_ndentp; /* IN/OUT: # of nodent */
diff --git a/drivers/staging/lustre/lnet/selftest/console.c b/drivers/staging/lustre/lnet/selftest/console.c
index 9af761f..bf4111a 100644
--- a/drivers/staging/lustre/lnet/selftest/console.c
+++ b/drivers/staging/lustre/lnet/selftest/console.c
@@ -926,11 +926,11 @@ static void lstcon_group_ndlink_release(struct lstcon_group *,
}
int
-lstcon_batch_info(char *name, lstcon_test_batch_ent_t __user *ent_up,
+lstcon_batch_info(char *name, struct lstcon_test_batch_ent __user *ent_up,
int server, int testidx, int *index_p, int *ndent_p,
struct lstcon_node_ent __user *dents_up)
{
- lstcon_test_batch_ent_t *entp;
+ struct lstcon_test_batch_ent *entp;
struct list_head *clilst;
struct list_head *srvlst;
struct lstcon_test *test = NULL;
@@ -969,7 +969,7 @@ static void lstcon_group_ndlink_release(struct lstcon_group *,
}
/* non-verbose query */
- LIBCFS_ALLOC(entp, sizeof(lstcon_test_batch_ent_t));
+ LIBCFS_ALLOC(entp, sizeof(struct lstcon_test_batch_ent));
if (!entp)
return -ENOMEM;
@@ -989,9 +989,9 @@ static void lstcon_group_ndlink_release(struct lstcon_group *,
LST_NODE_STATE_COUNTER(ndl->ndl_node, &entp->tbe_srv_nle);
rc = copy_to_user(ent_up, entp,
- sizeof(lstcon_test_batch_ent_t)) ? -EFAULT : 0;
+ sizeof(struct lstcon_test_batch_ent)) ? -EFAULT : 0;
- LIBCFS_FREE(entp, sizeof(lstcon_test_batch_ent_t));
+ LIBCFS_FREE(entp, sizeof(struct lstcon_test_batch_ent));
return rc;
}
diff --git a/drivers/staging/lustre/lnet/selftest/console.h b/drivers/staging/lustre/lnet/selftest/console.h
index 30d73b6..f8d61ce 100644
--- a/drivers/staging/lustre/lnet/selftest/console.h
+++ b/drivers/staging/lustre/lnet/selftest/console.h
@@ -227,7 +227,7 @@ int lstcon_test_batch_query(char *name, int testidx,
struct list_head __user *result_up);
int lstcon_batch_del(char *name);
int lstcon_batch_list(int idx, int namelen, char __user *name_up);
-int lstcon_batch_info(char *name, lstcon_test_batch_ent_t __user *ent_up,
+int lstcon_batch_info(char *name, struct lstcon_test_batch_ent __user *ent_up,
int server, int testidx, int *index_p,
int *ndent_p, struct lstcon_node_ent __user *dents_up);
int lstcon_group_stat(char *grp_name, int timeout,
--
1.8.3.1
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH 00/34] staging: lustre: lnet: change lnet selftest UAPI typedefs to proper structure James Simmons <jsimmons@infradead.org> - 2017-01-16 22:40 +0100 [PATCH 30/34] staging: lustre: lnet: change lst_brw_[type|flags]_t to proper enum James Simmons <jsimmons@infradead.org> - 2017-01-16 22:40 +0100 [PATCH 04/34] staging: lustre: lnet: change lstcon_ndlist_ent_t to proper structure James Simmons <jsimmons@infradead.org> - 2017-01-16 22:40 +0100 [PATCH 03/34] staging: lustre: lnet: change lstcon_node_ent_t to proper structure James Simmons <jsimmons@infradead.org> - 2017-01-16 22:40 +0100 [PATCH 09/34] staging: lustre: lnet: change lstcon_trans_stat_t to proper structure James Simmons <jsimmons@infradead.org> - 2017-01-16 22:40 +0100 [PATCH 01/34] staging: lustre: lnet: change lst_nid_t to proper structure James Simmons <jsimmons@infradead.org> - 2017-01-16 22:40 +0100 [PATCH 24/34] staging: lustre: lnet: change lstio_batch_query_args_t to proper structure James Simmons <jsimmons@infradead.org> - 2017-01-16 22:40 +0100 [PATCH 10/34] staging: lustre: lnet: change lstio_session_new_args_t to proper structure James Simmons <jsimmons@infradead.org> - 2017-01-16 22:40 +0100 [PATCH 26/34] staging: lustre: lnet: change lstio_batch_info_args_t to proper structure James Simmons <jsimmons@infradead.org> - 2017-01-16 22:40 +0100 [PATCH 17/34] staging: lustre: lnet: change lstio_group_nodes_args_t to proper structure James Simmons <jsimmons@infradead.org> - 2017-01-16 22:40 +0100 [PATCH 29/34] staging: lustre: lnet: change lstio_test_args_t to proper structure James Simmons <jsimmons@infradead.org> - 2017-01-16 22:40 +0100 [PATCH 27/34] staging: lustre: lnet: change lstio_stat_args_t to proper structure James Simmons <jsimmons@infradead.org> - 2017-01-16 22:40 +0100 [PATCH 25/34] staging: lustre: lnet: change lstio_batch_list_args_t to proper structure James Simmons <jsimmons@infradead.org> - 2017-01-16 22:40 +0100 [PATCH 14/34] staging: lustre: lnet: change lstio_group_add_args_t to proper structure James Simmons <jsimmons@infradead.org> - 2017-01-16 22:40 +0100 [PATCH 21/34] staging: lustre: lnet: change lstio_batch_del_args_t to proper structure James Simmons <jsimmons@infradead.org> - 2017-01-16 22:40 +0100 [PATCH 11/34] staging: lustre: lnet: change lstio_session_info_args_t to proper structure James Simmons <jsimmons@infradead.org> - 2017-01-16 22:40 +0100 [PATCH 33/34] staging: lustre: lnet: change srpc_counters_t to proper structure James Simmons <jsimmons@infradead.org> - 2017-01-16 22:40 +0100 [PATCH 34/34] staging: lustre: lnet: change sfw_counter_t to proper structure James Simmons <jsimmons@infradead.org> - 2017-01-16 22:40 +0100 [PATCH 31/34] staging: lustre: lnet: change lst_test_bulk_param_t to proper structure James Simmons <jsimmons@infradead.org> - 2017-01-16 22:40 +0100 [PATCH 23/34] staging: lustre: lnet: change lstio_batch_stop_args_t to proper structure James Simmons <jsimmons@infradead.org> - 2017-01-16 22:40 +0100 [PATCH 13/34] staging: lustre: lnet: change lstio_debug_args_t to proper structure James Simmons <jsimmons@infradead.org> - 2017-01-16 22:40 +0100 [PATCH 28/34] staging: lustre: lnet: change lst_test_type_t to proper enum James Simmons <jsimmons@infradead.org> - 2017-01-16 22:40 +0100 [PATCH 07/34] staging: lustre: lnet: change lstcon_test_batch_ent_t to proper structure James Simmons <jsimmons@infradead.org> - 2017-01-16 22:40 +0100 [PATCH 22/34] staging: lustre: lnet: change lstio_batch_run_args_t to proper structure James Simmons <jsimmons@infradead.org> - 2017-01-16 22:40 +0100 [PATCH 19/34] staging: lustre: lnet: change lstio_group_info_args_t to proper structure James Simmons <jsimmons@infradead.org> - 2017-01-16 22:40 +0100 [PATCH 20/34] staging: lustre: lnet: change lstio_batch_add_args_t to proper structure James Simmons <jsimmons@infradead.org> - 2017-01-16 22:40 +0100 [PATCH 06/34] staging: lustre: lnet: change lstcon_batch_ent_t to proper structure James Simmons <jsimmons@infradead.org> - 2017-01-16 22:40 +0100 [PATCH 08/34] staging: lustre: lnet: change lstcon_rpc_ent_t to proper structure James Simmons <jsimmons@infradead.org> - 2017-01-16 22:40 +0100 [PATCH 15/34] staging: lustre: lnet: change lstio_group_del_args_t to proper structure James Simmons <jsimmons@infradead.org> - 2017-01-16 22:40 +0100
csiph-web