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

Commit cd9f7d7e authored by James Simmons's avatar James Simmons Committed by Greg Kroah-Hartman
Browse files

staging: lustre: lnet: change lstcon_test_batch_ent_t to proper structure 



Change lstcon_test_batch_ent_t from typedef to proper structure.

Signed-off-by: default avatarJames 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: default avatarAndreas Dilger <andreas.dilger@intel.com>
Reviewed-by: default avatarDoug Oucharek <doug.s.oucharek@intel.com>
Signed-off-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 55442b51

drivers/staging/lustre/include/linux/lnet/lnetst.h

+3 −3
Original line number Diff line number Diff line
@@ -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 @@ typedef struct { 
		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 @@ typedef struct { 
	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 */

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

+5 −5
Original line number Diff line number Diff line
@@ -926,11 +926,11 @@ lstcon_batch_list(int index, int len, char __user *name_up) 
}



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 @@ lstcon_batch_info(char *name, lstcon_test_batch_ent_t __user *ent_up, 
	}



	/* 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 @@ lstcon_batch_info(char *name, lstcon_test_batch_ent_t __user *ent_up, 
		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;

}

drivers/staging/lustre/lnet/selftest/console.h

+1 −1
Original line number Diff line number Diff line
@@ -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,