Merge branch 'linus' into timers/urgent

Get upstream changes so we can apply fixes against them

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

1 files changed, 12 insertions, 0 deletions

diff --git a/fs/fat/inode.c b/fs/fat/inode.c
index 5d4513cb1b3c..11b51bb55b42 100644
--- a/fs/fat/inode.c
+++ b/fs/fat/inode.c
@@ -1415,6 +1415,18 @@ int fat_fill_super(struct super_block *sb, void *data, int silent, int isvfat,
                 brelse(fsinfo_bh);
         }
 
+        /* interpret volume ID as a little endian 32 bit integer */
+        if (sbi->fat_bits == 32)
+                sbi->vol_id = (((u32)b->fat32.vol_id[0]) |
+                                        ((u32)b->fat32.vol_id[1] << 8) |
+                                        ((u32)b->fat32.vol_id[2] << 16) |
+                                        ((u32)b->fat32.vol_id[3] << 24));
+        else /* fat 16 or 12 */
+                sbi->vol_id = (((u32)b->fat16.vol_id[0]) |
+                                        ((u32)b->fat16.vol_id[1] << 8) |
+                                        ((u32)b->fat16.vol_id[2] << 16) |
+                                        ((u32)b->fat16.vol_id[3] << 24));
+
         sbi->dir_per_block = sb->s_blocksize / sizeof(struct msdos_dir_entry);
         sbi->dir_per_block_bits = ffs(sbi->dir_per_block) - 1;