From b83ddf36f77ad04d06564301a7cdba80d651afd7 Mon Sep 17 00:00:00 2001 From: Ravishankar N Date: Thu, 20 Dec 2012 15:05:46 -0800 Subject: [PATCH] --- yaml --- r: 347888 b: refs/heads/master c: c39540c6d1add1d0ad843b3d2437311924193359 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/fat/dir.c | 5 ++--- trunk/fs/fat/inode.c | 2 +- trunk/fs/fat/misc.c | 4 ++++ 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 8bdf62f8c01e..227af49fe776 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 99bbb2b0d4431e67d11a98f66a6ef8fcd8622649 +refs/heads/master: c39540c6d1add1d0ad843b3d2437311924193359 diff --git a/trunk/fs/fat/dir.c b/trunk/fs/fat/dir.c index 2a182342442e..58bf744dbf39 100644 --- a/trunk/fs/fat/dir.c +++ b/trunk/fs/fat/dir.c @@ -461,8 +461,7 @@ static int fat_parse_short(struct super_block *sb, } /* - * Return values: negative -> error, 0 -> not found, positive -> found, - * value is the total amount of slots, including the shortname entry. + * Return values: negative -> error/not found, 0 -> found. */ int fat_search_long(struct inode *inode, const unsigned char *name, int name_len, struct fat_slot_info *sinfo) @@ -1255,7 +1254,7 @@ int fat_add_entries(struct inode *dir, void *slots, int nr_slots, sinfo->nr_slots = nr_slots; - /* First stage: search free direcotry entries */ + /* First stage: search free directory entries */ free_slots = nr_bhs = 0; bh = prev = NULL; pos = 0; diff --git a/trunk/fs/fat/inode.c b/trunk/fs/fat/inode.c index 35806813ea4e..f8f491677a4a 100644 --- a/trunk/fs/fat/inode.c +++ b/trunk/fs/fat/inode.c @@ -1344,7 +1344,7 @@ int fat_fill_super(struct super_block *sb, void *data, int silent, int isvfat, sbi->dir_entries = get_unaligned_le16(&b->dir_entries); if (sbi->dir_entries & (sbi->dir_per_block - 1)) { if (!silent) - fat_msg(sb, KERN_ERR, "bogus directroy-entries per block" + fat_msg(sb, KERN_ERR, "bogus directory-entries per block" " (%u)", sbi->dir_entries); brelse(bh); goto out_invalid; diff --git a/trunk/fs/fat/misc.c b/trunk/fs/fat/misc.c index 5eb600dc43a9..359d307b5507 100644 --- a/trunk/fs/fat/misc.c +++ b/trunk/fs/fat/misc.c @@ -135,6 +135,10 @@ int fat_chain_add(struct inode *inode, int new_dclus, int nr_cluster) } if (ret < 0) return ret; + /* + * FIXME:Although we can add this cache, fat_cache_add() is + * assuming to be called after linear search with fat_cache_id. + */ // fat_cache_add(inode, new_fclus, new_dclus); } else { MSDOS_I(inode)->i_start = new_dclus;