Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

fat: remove FAT_FIRST_ENT macro

The comment edited in this patch was the only reference to the
FAT_FIRST_ENT macro, which is not used anymore. Moreover, the commented
line of code does not compile with the current code.

Since the FAT_FIRST_ENT macro checks the FAT variant in a way that the
patch series changes, I removed it, and instead wrote a clear
explanation of what was checked.

I verified that the changed comment is correct according to Microsoft
FAT spec, search for "BPB_Media" in the following references:

1. Microsoft FAT specification 2005
(http://read.pudn.com/downloads77/ebook/294884/FAT32%20Spec%20%28SDA%20Contribution%29.pdf).
Search for 'volume label'.
2. Microsoft Extensible Firmware Initiative, FAT32 File System Specification
(https://staff.washington.edu/dittrich/misc/fatgen103.pdf).
Search for 'volume label'.

Link: http://lkml.kernel.org/r/1544990640-11604-2-git-send-email-carmeli.tamir@gmail.com
Signed-off-by: Carmeli Tamir <carmeli.tamir@gmail.com>
Acked-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Reviewed-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
Cc: Bart Van Assche <bvanassche@acm.org>
Cc: Johannes Thumshirn <jthumshirn@suse.de>
Cc: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Carmeli Tamir and committed by
Linus Torvalds
b553337a 9da22854

+8 -7
+8 -4
fs/fat/inode.c
··· 1803 1803 fat_ent_access_init(sb); 1804 1804 1805 1805 /* 1806 - * The low byte of FAT's first entry must have same value with 1807 - * media-field. But in real world, too many devices is 1808 - * writing wrong value. So, removed that validity check. 1806 + * The low byte of the first FAT entry must have the same value as 1807 + * the media field of the boot sector. But in real world, too many 1808 + * devices are writing wrong values. So, removed that validity check. 1809 1809 * 1810 - * if (FAT_FIRST_ENT(sb, media) != first) 1810 + * The removed check compared the first FAT entry to a value dependent 1811 + * on the media field like this: 1812 + * == (0x0F00 | media), for FAT12 1813 + * == (0XFF00 | media), for FAT16 1814 + * == (0x0FFFFF | media), for FAT32 1811 1815 */ 1812 1816 1813 1817 error = -EINVAL;
-3
include/uapi/linux/msdos_fs.h
··· 58 58 #define MSDOS_DOT ". " /* ".", padded to MSDOS_NAME chars */ 59 59 #define MSDOS_DOTDOT ".. " /* "..", padded to MSDOS_NAME chars */ 60 60 61 - #define FAT_FIRST_ENT(s, x) ((MSDOS_SB(s)->fat_bits == 32 ? 0x0FFFFF00 : \ 62 - MSDOS_SB(s)->fat_bits == 16 ? 0xFF00 : 0xF00) | (x)) 63 - 64 61 /* start of data cluster's entry (number of reserved clusters) */ 65 62 #define FAT_START_ENT 2 66 63