Fixes the following sparse warnings:
drivers/staging/lustre/lustre/lmv/lmv_obd.c:2305:23: warning: invalid
assignment: |=
drivers/staging/lustre/lustre/lmv/lmv_obd.c:2305:23: left side has type
restricted __le32
drivers/staging/lustre/lustre/lmv/lmv_obd.c:2305:23: right side has type int
drivers/staging/lustre/lustre/lmv/lmv_obd.c:2383:39: warning: invalid
assignment: |=
drivers/staging/lustre/lustre/lmv/lmv_obd.c:2383:39: left side has type
restricted __le32
drivers/staging/lustre/lustre/lmv/lmv_obd.c:2383:39: right side has type int
Replaces one final conversion with two conversions on flag assignment.
Signed-off-by: Valentin Vidic <valentin.vi...@carnet.hr>
---
drivers/staging/lustre/lustre/lmv/lmv_obd.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/lustre/lustre/lmv/lmv_obd.c
b/drivers/staging/lustre/lustre/lmv/lmv_obd.c
index 09b469243d73..4e6c1202a957 100644
--- a/drivers/staging/lustre/lustre/lmv/lmv_obd.c
+++ b/drivers/staging/lustre/lustre/lmv/lmv_obd.c
@@ -2302,7 +2302,7 @@ static int lmv_read_striped_page(struct obd_export *exp,
dp = kmap(ent_page);
memset(dp, 0, sizeof(*dp));
dp->ldp_hash_start = cpu_to_le64(offset);
- dp->ldp_flags |= LDF_COLLIDE;
+ dp->ldp_flags |= cpu_to_le32(LDF_COLLIDE);
area = dp + 1;
left_bytes = PAGE_SIZE - sizeof(*dp);
@@ -2380,8 +2380,7 @@ static int lmv_read_striped_page(struct obd_export *exp,
ent_page = NULL;
} else {
if (ent == area)
- dp->ldp_flags |= LDF_EMPTY;
- dp->ldp_flags = cpu_to_le32(dp->ldp_flags);
+ dp->ldp_flags |= cpu_to_le32(LDF_EMPTY);
dp->ldp_hash_end = cpu_to_le64(hash_offset);
}
--
2.11.0
