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

Commit 18ecab0d authored by JC Lafoucriere's avatar JC Lafoucriere Committed by Greg Kroah-Hartman
Browse files

staging: lustre: hsm: rename hai_zero() HSM function 



rename hai_zero() to hai_first(). Use a better name for hai helper

Signed-off-by: default avatarJC Lafoucriere <jacques-charles.lafoucriere@cea.fr>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-3709
Reviewed-on: http://review.whamcloud.com/7254


Reviewed-by: default avatarJinshan Xiong <jinshan.xiong@intel.com>
Reviewed-by: default avatarJohn L. Hammond <john.hammond@intel.com>
Reviewed-by: default avatarOleg Drokin <oleg.drokin@intel.com>
Signed-off-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ead02808

drivers/staging/lustre/lustre/include/lustre/lustre_user.h

+3 −3
Original line number Diff line number Diff line
@@ -1095,7 +1095,7 @@ struct hsm_action_list { 
	__u32 padding1;

	char  hal_fsname[0];   /* null-terminated */

	/* struct hsm_action_item[hal_count] follows, aligned on 8-byte

	 * boundaries. See hai_zero

	 * boundaries. See hai_first

	 */

} __packed;
@@ -1109,7 +1109,7 @@ static inline int cfs_size_round(int val) 
#endif



/* Return pointer to first hai in action list */

static inline struct hsm_action_item *hai_zero(struct hsm_action_list *hal)

static inline struct hsm_action_item *hai_first(struct hsm_action_list *hal)

{

	return (struct hsm_action_item *)(hal->hal_fsname +

					  cfs_size_round(strlen(hal-> \
@@ -1131,7 +1131,7 @@ static inline int hal_size(struct hsm_action_list *hal) 
	struct hsm_action_item *hai;



	sz = sizeof(*hal) + cfs_size_round(strlen(hal->hal_fsname) + 1);

	hai = hai_zero(hal);

	hai = hai_first(hal);

	for (i = 0; i < hal->hal_count; i++, hai = hai_next(hai))

		sz += cfs_size_round(hai->hai_len);

drivers/staging/lustre/lustre/mdc/mdc_request.c

+1 −1
Original line number Diff line number Diff line
@@ -1952,7 +1952,7 @@ static void lustre_swab_hal(struct hsm_action_list *h) 
	__swab32s(&h->hal_count);

	__swab32s(&h->hal_archive_id);

	__swab64s(&h->hal_flags);

	hai = hai_zero(h);

	hai = hai_first(h);

	for (i = 0; i < h->hal_count; i++, hai = hai_next(hai))

		lustre_swab_hai(hai);

}