Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 330140
b: refs/heads/master
c: 441dff3
h: refs/heads/master
v: v3
  • Loading branch information
Cruz Julian Bishop authored and Linus Torvalds committed Oct 5, 2012
1 parent 9d8f12c commit 3012de2
Show file tree
Hide file tree
Showing 2 changed files with 7 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: f08b4988f229fb41a4995829dc0db34c5e35dfbb
refs/heads/master: 441dff34aa39e1597bdf2fdd07fe83be56528b32
10 changes: 6 additions & 4 deletions trunk/fs/fat/fatent.c
Original file line number Diff line number Diff line change
Expand Up @@ -203,15 +203,18 @@ static int fat12_ent_next(struct fat_entry *fatent)

fatent->entry++;
if (fatent->nr_bhs == 1) {
WARN_ON(ent12_p[0] > (u8 *)(bhs[0]->b_data + (bhs[0]->b_size - 2)));
WARN_ON(ent12_p[1] > (u8 *)(bhs[0]->b_data + (bhs[0]->b_size - 1)));
WARN_ON(ent12_p[0] > (u8 *)(bhs[0]->b_data +
(bhs[0]->b_size - 2)));
WARN_ON(ent12_p[1] > (u8 *)(bhs[0]->b_data +
(bhs[0]->b_size - 1)));
if (nextp < (u8 *)(bhs[0]->b_data + (bhs[0]->b_size - 1))) {
ent12_p[0] = nextp - 1;
ent12_p[1] = nextp;
return 1;
}
} else {
WARN_ON(ent12_p[0] != (u8 *)(bhs[0]->b_data + (bhs[0]->b_size - 1)));
WARN_ON(ent12_p[0] != (u8 *)(bhs[0]->b_data +
(bhs[0]->b_size - 1)));
WARN_ON(ent12_p[1] != (u8 *)bhs[1]->b_data);
ent12_p[0] = nextp - 1;
ent12_p[1] = nextp;
Expand Down Expand Up @@ -631,7 +634,6 @@ int fat_free_clusters(struct inode *inode, int cluster)

return err;
}

EXPORT_SYMBOL_GPL(fat_free_clusters);

/* 128kb is the whole sectors for FAT12 and FAT16 */
Expand Down

0 comments on commit 3012de2

Please sign in to comment.