Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1371102

[PATCH 07/18] staging: lustre: hsm: rename hai_zero() HSM function

Show all headers | View raw

From: JC Lafoucriere <jacques-charles.lafoucriere@cea.fr>

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

Signed-off-by: JC 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: Jinshan Xiong <jinshan.xiong@intel.com>
Reviewed-by: John L. Hammond <john.hammond@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: James Simmons <jsimmons@infradead.org>
---
 .../lustre/lustre/include/lustre/lustre_user.h     |    6 +++---
 drivers/staging/lustre/lustre/mdc/mdc_request.c    |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/lustre/lustre/include/lustre/lustre_user.h b/drivers/staging/lustre/lustre/include/lustre/lustre_user.h
index 19f2271..4672145 100644
--- a/drivers/staging/lustre/lustre/include/lustre/lustre_user.h
+++ b/drivers/staging/lustre/lustre/include/lustre/lustre_user.h
@@ -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);
 
diff --git a/drivers/staging/lustre/lustre/mdc/mdc_request.c b/drivers/staging/lustre/lustre/mdc/mdc_request.c
index 98b27f1..a089237 100644
--- a/drivers/staging/lustre/lustre/mdc/mdc_request.c
+++ b/drivers/staging/lustre/lustre/mdc/mdc_request.c
@@ -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);
 }
-- 
1.7.1

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 00/18] fill in missing patches present in 2.4.92 version James Simmons <jsimmons@infradead.org> - 2016-04-05 03:50 +0200
  [PATCH 05/18] staging: lustre: libcfs: make D_HSM a unique value James Simmons <jsimmons@infradead.org> - 2016-04-05 03:50 +0200
  [PATCH 13/18] staging: lustre: hsm: Add CLF_RENAME_LAST flag James Simmons <jsimmons@infradead.org> - 2016-04-05 03:50 +0200
  [PATCH 16/18] staging: lustre: hsm: Add support to drop all pages for ll_data_version James Simmons <jsimmons@infradead.org> - 2016-04-05 03:50 +0200
  [PATCH 04/18] staging: lustre: libcfs: create array of debug names James Simmons <jsimmons@infradead.org> - 2016-04-05 03:50 +0200
  [PATCH 15/18] staging: lustre: llite: cancel open lock before closing file James Simmons <jsimmons@infradead.org> - 2016-04-05 03:50 +0200
  [PATCH 03/18] staging: lustre: libcfs: remove userland comments in libcfs_debug.h James Simmons <jsimmons@infradead.org> - 2016-04-05 03:50 +0200
  [PATCH 12/18] staging: lustre: mdc: document mdc_rpc_lock James Simmons <jsimmons@infradead.org> - 2016-04-05 03:50 +0200
  [PATCH 02/18] staging: lustre: llite: use 64bits flags in ll_lov_setea() James Simmons <jsimmons@infradead.org> - 2016-04-05 03:50 +0200
  [PATCH 08/18] staging: lustre: hsm: copy start error should set HP_FLAG_COMPLETED James Simmons <jsimmons@infradead.org> - 2016-04-05 03:50 +0200
  [PATCH 11/18] staging: lustre: llite: Delaying creation of client side proc entries. James Simmons <jsimmons@infradead.org> - 2016-04-05 03:50 +0200
  [PATCH 01/18] staging: lustre: ldlm: fix 'deadcode' errors James Simmons <jsimmons@infradead.org> - 2016-04-05 03:50 +0200
  [PATCH 17/18] staging: lustre: fix 'no effect' errors James Simmons <jsimmons@infradead.org> - 2016-04-05 03:50 +0200
  [PATCH 07/18] staging: lustre: hsm: rename hai_zero() HSM function James Simmons <jsimmons@infradead.org> - 2016-04-05 03:50 +0200
  [PATCH 10/18] staging: lustre: llite: reset writeback index in ll_writepages James Simmons <jsimmons@infradead.org> - 2016-04-05 03:50 +0200
  [PATCH 06/18] staging: lustre: hsm: Fix lu_ref for lease handle James Simmons <jsimmons@infradead.org> - 2016-04-05 03:50 +0200
  [PATCH 14/18] staging: lustre: fix 'NULL pointer dereference' errors James Simmons <jsimmons@infradead.org> - 2016-04-05 03:50 +0200
  [PATCH 09/18] staging: lustre: lov: Get the correct address of lmm_objects James Simmons <jsimmons@infradead.org> - 2016-04-05 04:00 +0200

csiph-web