Merge tag 'selinux-pr-20191007' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux.git] / drivers / nvdimm / btt.c

diff --git a/drivers/nvdimm/btt.c b/drivers/nvdimm/btt.c
index a8d56887ec881e7d87aa280f1f34219e07eb7bbb..3e9f45aec8d189d64dc94c78f274a20a02a6fc1b 100644 (file)
--- a/drivers/nvdimm/btt.c
+++ b/drivers/nvdimm/btt.c
@@ -392,9 +392,9 @@ static int btt_flog_write(struct arena_info *arena, u32 lane, u32 sub,
        arena->freelist[lane].sub = 1 - arena->freelist[lane].sub;
        if (++(arena->freelist[lane].seq) == 4)
                arena->freelist[lane].seq = 1;
-       if (ent_e_flag(ent->old_map))
+       if (ent_e_flag(le32_to_cpu(ent->old_map)))
                arena->freelist[lane].has_err = 1;
-       arena->freelist[lane].block = le32_to_cpu(ent_lba(ent->old_map));
+       arena->freelist[lane].block = ent_lba(le32_to_cpu(ent->old_map));
 
        return ret;
 }
@@ -560,8 +560,8 @@ static int btt_freelist_init(struct arena_info *arena)
                 * FIXME: if error clearing fails during init, we want to make
                 * the BTT read-only
                 */
-               if (ent_e_flag(log_new.old_map) &&
-                               !ent_normal(log_new.old_map)) {
+               if (ent_e_flag(le32_to_cpu(log_new.old_map)) &&
+                   !ent_normal(le32_to_cpu(log_new.old_map))) {
                        arena->freelist[i].has_err = 1;
                        ret = arena_clear_freelist_error(arena, i);
                        if (ret)