Merge 4.7-rc4 into staging-next

We want the fixes in here, and we can resolve a merge issue in
drivers/iio/industrialio-trigger.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 9 insertions, 4 deletions

diff --git a/fs/udf/partition.c b/fs/udf/partition.c
index 5f861ed287c3..888c364b2fe9 100644
--- a/fs/udf/partition.c
+++ b/fs/udf/partition.c
@@ -295,7 +295,8 @@ static uint32_t udf_try_read_meta(struct inode *inode, uint32_t block,
                 map = &UDF_SB(sb)->s_partmaps[partition];
                 /* map to sparable/physical partition desc */
                 phyblock = udf_get_pblock(sb, eloc.logicalBlockNum,
-                        map->s_partition_num, ext_offset + offset);
+                        map->s_type_specific.s_metadata.s_phys_partition_ref,
+                        ext_offset + offset);
         }
 
         brelse(epos.bh);
@@ -317,14 +318,18 @@ uint32_t udf_get_pblock_meta25(struct super_block *sb, uint32_t block,
         mdata = &map->s_type_specific.s_metadata;
         inode = mdata->s_metadata_fe ? : mdata->s_mirror_fe;
 
-        /* We shouldn't mount such media... */
-        BUG_ON(!inode);
+        if (!inode)
+                return 0xFFFFFFFF;
+
         retblk = udf_try_read_meta(inode, block, partition, offset);
         if (retblk == 0xFFFFFFFF && mdata->s_metadata_fe) {
                 udf_warn(sb, "error reading from METADATA, trying to read from MIRROR\n");
                 if (!(mdata->s_flags & MF_MIRROR_FE_LOADED)) {
                         mdata->s_mirror_fe = udf_find_metadata_inode_efe(sb,
-                                mdata->s_mirror_file_loc, map->s_partition_num);
+                                mdata->s_mirror_file_loc,
+                                mdata->s_phys_partition_ref);
+                        if (IS_ERR(mdata->s_mirror_fe))
+                                mdata->s_mirror_fe = NULL;
                         mdata->s_flags |= MF_MIRROR_FE_LOADED;
                 }