Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

[cascardo/linux.git] / fs / fat / inode.c

diff --git a/fs/fat/inode.c b/fs/fat/inode.c
index 5d4513c..11b51bb 100644 (file)
--- 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;