[PATCH 061/124] staging: lustre: obd: cleanup struct md_op_data and uses

From: James Simmons
Date: Sun Sep 18 2016 - 16:59:44 EST


From: John L. Hammond <john.hammond@xxxxxxxxx>

Make the following changes in or around struct md_op_data:

* rename enum op_cli_flags to enum md_cli_flags.

* Change to type of the op_flags member from __u32 to enum
md_op_flags.

* Remove the used but never set member op_npages.

* Remove the set but never used member op_stripe_offset (an alias for
op_ioepoch).

* Remove the op_max_pages alias for op_valid and add a op_max_pages
member.

Signed-off-by: John L. Hammond <john.hammond@xxxxxxxxx>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-2675
Reviewed-on: http://review.whamcloud.com/11734
Reviewed-by: Bob Glossman <bob.glossman@xxxxxxxxx>
Reviewed-by: James Simmons <uja.ornl@xxxxxxxxx>
Reviewed-by: Dmitry Eremin <dmitry.eremin@xxxxxxxxx>
Reviewed-by: Oleg Drokin <oleg.drokin@xxxxxxxxx>
Signed-off-by: James Simmons <jsimmons@xxxxxxxxxxxxx>
---
drivers/staging/lustre/lustre/include/obd.h | 23 ++++++++++-------------
drivers/staging/lustre/lustre/mdc/mdc_request.c | 3 +--
2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/drivers/staging/lustre/lustre/include/obd.h b/drivers/staging/lustre/lustre/include/obd.h
index 8a7c803..2d25e40 100644
--- a/drivers/staging/lustre/lustre/include/obd.h
+++ b/drivers/staging/lustre/lustre/include/obd.h
@@ -736,6 +736,14 @@ static inline int it_to_lock_mode(struct lookup_intent *it)
return -EINVAL;
}

+enum md_cli_flags {
+ CLI_SET_MEA = BIT(0),
+ CLI_RM_ENTRY = BIT(1),
+ CLI_HASH64 = BIT(2),
+ CLI_API32 = BIT(3),
+ CLI_MIGRATE = BIT(4),
+};
+
struct md_op_data {
struct lu_fid op_fid1; /* operation fid1 (usually parent) */
struct lu_fid op_fid2; /* operation fid2 (usually child) */
@@ -773,35 +781,24 @@ struct md_op_data {
__u64 op_offset;

/* Used by readdir */
- __u32 op_npages;
+ __u32 op_max_pages;

/* used to transfer info between the stacks of MD client
* see enum op_cli_flags
*/
- __u32 op_cli_flags;
+ enum md_cli_flags op_cli_flags;

/* File object data version for HSM release, on client */
__u64 op_data_version;
struct lustre_handle op_lease_handle;
};

-#define op_stripe_offset op_ioepoch
-#define op_max_pages op_valid
-
struct md_callback {
int (*md_blocking_ast)(struct ldlm_lock *lock,
struct ldlm_lock_desc *desc,
void *data, int flag);
};

-enum op_cli_flags {
- CLI_SET_MEA = 1 << 0,
- CLI_RM_ENTRY = 1 << 1,
- CLI_HASH64 = BIT(2),
- CLI_API32 = BIT(3),
- CLI_MIGRATE = BIT(4),
-};
-
struct md_enqueue_info;
/* metadata stat-ahead */

diff --git a/drivers/staging/lustre/lustre/mdc/mdc_request.c b/drivers/staging/lustre/lustre/mdc/mdc_request.c
index 8c2f6d6..166f0c4 100644
--- a/drivers/staging/lustre/lustre/mdc/mdc_request.c
+++ b/drivers/staging/lustre/lustre/mdc/mdc_request.c
@@ -1264,8 +1264,7 @@ static int mdc_read_page_remote(void *data, struct page *page0)
lu_pgs >>= LU_PAGE_SHIFT;
LASSERT(!(req->rq_bulk->bd_nob_transferred & ~LU_PAGE_MASK));

- CDEBUG(D_INODE, "read %d(%d)/%d pages\n", rd_pgs, lu_pgs,
- op_data->op_npages);
+ CDEBUG(D_INODE, "read %d(%d) pages\n", rd_pgs, lu_pgs);

mdc_adjust_dirpages(page_pool, rd_pgs, lu_pgs);

--
1.7.1