Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751626AbeANMuy (ORCPT + 1 other); Sun, 14 Jan 2018 07:50:54 -0500 Received: from mail.parknet.co.jp ([210.171.160.6]:36696 "EHLO mail.parknet.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751015AbeANMux (ORCPT ); Sun, 14 Jan 2018 07:50:53 -0500 From: OGAWA Hirofumi To: ChenGuanqiao Cc: linux-kernel@vger.kernel.org Subject: Re: [PATCH v7 2/3] fs: fat: Add volume label entry method function References: <20180110102153.12388-1-chen.chenchacha@foxmail.com> <20180110102153.12388-3-chen.chenchacha@foxmail.com> Date: Sun, 14 Jan 2018 21:50:50 +0900 In-Reply-To: <20180110102153.12388-3-chen.chenchacha@foxmail.com> (ChenGuanqiao's message of "Wed, 10 Jan 2018 18:21:52 +0800") Message-ID: <87bmhweh91.fsf@mail.parknet.co.jp> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return-Path: ChenGuanqiao writes: > Signed-off-by: ChenGuanqiao > --- > fs/fat/dir.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 53 insertions(+) > > diff --git a/fs/fat/dir.c b/fs/fat/dir.c > index 8e100c3bf72c..53f36c03760e 100644 > --- a/fs/fat/dir.c > +++ b/fs/fat/dir.c > @@ -881,6 +881,59 @@ static int fat_get_short_entry(struct inode *dir, loff_t *pos, > return -ENOENT; > } > > +int fat_get_volume_label_entry(struct inode *dir, struct buffer_head **bh, > + struct msdos_dir_entry **de) > +{ > + loff_t pos = 0; > + > + if (dir->i_ino != MSDOS_ROOT_INO) > + return -EFAULT; Now, dir is always root, so this check doesn't matter. > + *bh = NULL; > + *de = NULL; > + while (fat_get_entry(dir, &pos, bh, de) >= 0) { > + if (((*de)->attr & ATTR_VOLUME) && ((*de)->attr != ATTR_EXT) && > + !IS_FREE((*de)->name)) > + return 0; > + } > + return -ENOENT; > +} > +EXPORT_SYMBOL_GPL(fat_get_volume_label_entry); > + > +int fat_add_volume_label_entry(struct inode *dir, const unsigned char *name, > + struct timespec *ts) > +{ > + struct msdos_sb_info *sbi = MSDOS_SB(dir->i_sb); > + struct msdos_dir_entry de; > + struct fat_slot_info sinfo; > + __le16 time, date; > + int err; > + > + if (dir->i_ino != MSDOS_ROOT_INO) > + return -EFAULT; Here is too. dir is always root. > + memcpy(de.name, name, MSDOS_NAME); > + de.attr = ATTR_VOLUME; > + de.lcase = 0; > + fat_time_unix2fat(sbi, ts, &time, &date, NULL); > + de.cdate = de.adate = 0; > + de.ctime = 0; > + de.ctime_cs = 0; > + de.time = time; > + de.date = date; > + fat_set_start(&de, 0); > + de.size = 0; > + > + err = fat_add_entries(dir, &de, 1, &sinfo); > + if (err) > + return err; > + > + brelse(sinfo.bh); > + > + return 0; > +} > +EXPORT_SYMBOL_GPL(fat_add_volume_label_entry); -- OGAWA Hirofumi