From: Ross Zwisler <ross.zwisler@linux.intel.com>
Date: Sat, 3 Feb 2018 07:26:10 +0000 (-0700)
Subject: Merge branch 'for-4.16/dax' into libnvdimm-for-next
X-Git-Tag: v4.16-rc1~59^2~1
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=d121f07691415df824e6b60520f782f6d13b3c81;p=linux.git

Merge branch 'for-4.16/dax' into libnvdimm-for-next
---

d121f07691415df824e6b60520f782f6d13b3c81
diff --cc drivers/nvdimm/btt.c
index 5860f99113c6,c586bcdb5190..2ef544f10ec8
--- a/drivers/nvdimm/btt.c
+++ b/drivers/nvdimm/btt.c
@@@ -759,6 -884,14 +885,13 @@@ static int discover_arenas(struct btt *
  		arena->external_lba_start = cur_nlba;
  		parse_arena_meta(arena, super, cur_off);
  
+ 		ret = log_set_indices(arena);
+ 		if (ret) {
+ 			dev_err(to_dev(arena),
+ 				"Unable to deduce log/padding indices\n");
+ 			goto out;
+ 		}
+ 
 -		mutex_init(&arena->err_lock);
  		ret = btt_freelist_init(arena);
  		if (ret)
  			goto out;