Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 347888
b: refs/heads/master
c: c39540c
h: refs/heads/master
v: v3
  • Loading branch information
Ravishankar N authored and Linus Torvalds committed Dec 21, 2012
1 parent 7e1a772 commit b83ddf3
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 99bbb2b0d4431e67d11a98f66a6ef8fcd8622649
refs/heads/master: c39540c6d1add1d0ad843b3d2437311924193359
5 changes: 2 additions & 3 deletions trunk/fs/fat/dir.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion trunk/fs/fat/inode.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 4 additions & 0 deletions trunk/fs/fat/misc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit b83ddf3

Please sign in to comment.