Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752512AbdLYLXL (ORCPT ); Mon, 25 Dec 2017 06:23:11 -0500 Received: from smtpbgsg2.qq.com ([54.254.200.128]:59023 "EHLO smtpbgsg2.qq.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752321AbdLYLW6 (ORCPT ); Mon, 25 Dec 2017 06:22:58 -0500 X-QQ-mid: esmtp12t1514200972t405amjbo X-QQ-SSF: A1000000000000907H100000000000P X-QQ-FEAT: 9w50BnWz/RM6rEUclIKtdl4lDjlcN0fpie4Cn4b7My3p1ov/JgJSzmzVmtcbZ gRV8Z/RcX1j7r/zhmhlcOt+IjBq16MQ9nad8wALSNNxnHnH44vHFKD+sWzPzmS9TR+hhZkk V9mwW2nqucdGvMhig3QhFbaT0QRKzsS58DDL2jbRZG5AX30j7n5oCnMk3VV2LF4NeV/cYCY JJXK+sUyT2i56Df0FinCOoGhEhn3J9IyCxDmKvTRI2UJlhzVgq0eBVCaiprPo4VoJg7j1lf 9mJAlILE0MkUTEpJMbQuwTYCMe1rFdR7awHA== X-QQ-GoodBg: 0 From: ChenGuanqiao To: hirofumi@mail.parknet.co.jp Cc: linux-kernel@vger.kernel.org, ChenGuanqiao Subject: [PATCH v4 1/2] fs: fat: Add fat filesystem partition volume label in local structure Date: Mon, 25 Dec 2017 19:20:19 +0800 Message-Id: <20171225112020.2267-2-chen.chenchacha@foxmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171225112020.2267-1-chen.chenchacha@foxmail.com> References: <20171225112020.2267-1-chen.chenchacha@foxmail.com> X-QQ-SENDSIZE: 520 Feedback-ID: esmtp:foxmail.com:bgforeign:bgforeign3 X-QQ-Bgrelay: 1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3147 Lines: 89 Signedat-off-by: ChenGuanqiao --- fs/fat/fat.h | 1 + fs/fat/inode.c | 15 ++++++++++++--- include/uapi/linux/msdos_fs.h | 2 ++ 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/fs/fat/fat.h b/fs/fat/fat.h index 051dac1ce3be..c49ed0223bd8 100644 --- a/fs/fat/fat.h +++ b/fs/fat/fat.h @@ -85,6 +85,7 @@ struct msdos_sb_info { int dir_per_block; /* dir entries per block */ int dir_per_block_bits; /* log2(dir_per_block) */ unsigned int vol_id; /*volume ID*/ + char vol_label[11]; /*volume label*/ int fatent_shift; const struct fatent_operations *fatent_ops; diff --git a/fs/fat/inode.c b/fs/fat/inode.c index 30c52394a7ad..e73379a41d49 100644 --- a/fs/fat/inode.c +++ b/fs/fat/inode.c @@ -45,12 +45,14 @@ struct fat_bios_param_block { u8 fat16_state; u32 fat16_vol_id; + u8 fat16_vol_label[11]; u32 fat32_length; u32 fat32_root_cluster; u16 fat32_info_sector; u8 fat32_state; u32 fat32_vol_id; + u8 fat32_vol_label[11]; }; static int fat_default_codepage = CONFIG_FAT_DEFAULT_CODEPAGE; @@ -1460,12 +1462,16 @@ static int fat_read_bpb(struct super_block *sb, struct fat_boot_sector *b, bpb->fat16_state = b->fat16.state; bpb->fat16_vol_id = get_unaligned_le32(b->fat16.vol_id); + memcpy(bpb->fat16_vol_label, b->fat16.vol_label, + sizeof(bpb->fat16_vol_label)); bpb->fat32_length = le32_to_cpu(b->fat32.length); bpb->fat32_root_cluster = le32_to_cpu(b->fat32.root_cluster); bpb->fat32_info_sector = le16_to_cpu(b->fat32.info_sector); bpb->fat32_state = b->fat32.state; bpb->fat32_vol_id = get_unaligned_le32(b->fat32.vol_id); + memcpy(bpb->fat32_vol_label, b->fat32.vol_label, + sizeof(bpb->fat32_vol_label)); /* Validate this looks like a FAT filesystem BPB */ if (!bpb->fat_reserved) { @@ -1723,11 +1729,14 @@ 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) + /* interpret volume ID and label as a little endian 32 bit integer */ + if (sbi->fat_bits == 32) { sbi->vol_id = bpb.fat32_vol_id; - else /* fat 16 or 12 */ + memcpy(sbi->vol_label, bpb.fat32_vol_label, sizeof(sbi->vol_label)); + } else { /* fat 16 or 12 */ sbi->vol_id = bpb.fat16_vol_id; + memcpy(sbi->vol_label, bpb.fat16_vol_label, sizeof(sbi->vol_label)); + } sbi->dir_per_block = sb->s_blocksize / sizeof(struct msdos_dir_entry); sbi->dir_per_block_bits = ffs(sbi->dir_per_block) - 1; diff --git a/include/uapi/linux/msdos_fs.h b/include/uapi/linux/msdos_fs.h index e956704f5fb1..b4fced0988a9 100644 --- a/include/uapi/linux/msdos_fs.h +++ b/include/uapi/linux/msdos_fs.h @@ -106,6 +106,8 @@ struct __fat_dirent { #define FAT_IOCTL_SET_ATTRIBUTES _IOW('r', 0x11, __u32) /*Android kernel has used 0x12, so we use 0x13*/ #define FAT_IOCTL_GET_VOLUME_ID _IOR('r', 0x13, __u32) +#define FAT_IOCTL_GET_VOLUME_LABEL _IOR('r', 0x14, __u8[11]) +#define FAT_IOCTL_SET_VOLUME_LABEL _IOW('r', 0x15, __u8[11]) struct fat_boot_sector { __u8 ignored[3]; /* Boot strap short or near jump */ -- 2.11.0