Skip to contentSkip to conversation

fat:fix incorrect function comment

PATCH Superseded Ravishankar N 2 participants 2 messages Dec 18, 2012 – Dec 19, 2012 VFAT/FAT/msdos filesystem

lore
Share & tools
lore

Ravishankar N

author
#0 lore raw

PATCH 1/1 fat:fix incorrect function comment

fat_search_long() returns 0 on success, -ENOENT/ENOMEM on failure.Change the function comment accordingly.

While at it, fix some trivial typos.

	modified:   fs/fat/dir.c
	modified:   fs/fat/inode.c
	modified:   fs/fat/misc.c
Signed-off-by Ravishankar N <[email protected]>
Signed-off-by Namjae Jeon <[email protected]>
---
 fs/fat/dir.c   |    7 +++----
 fs/fat/inode.c |    2 +-
 fs/fat/misc.c  |    1 -
 3 files changed, 4 insertions(+), 6 deletions(-)
fs/fat/dir.c +3 -4
index 2a18234..b56e61a 100644
@@ -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)

@@ -1176,7 +1175,7 @@ static int fat_add_new_entries(struct inode *dir, void *slots, int nr_slots,
 
 	/*
 	 * The minimum cluster size is 512bytes, and maximum entry
-	 * size is 32*slots (672bytes).  So, iff the cluster size is
+	 * size is 32*slots (672bytes).  So, if the cluster size is
 	 * 512bytes, we may need two clusters.
 	 */
 	size = nr_slots * sizeof(struct msdos_dir_entry);

@@ -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;
fs/fat/inode.c +1 -1
index 3580681..f8f4916 100644
@@ -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;
fs/fat/misc.c +0 -1
index 5eb600d..e29ec41 100644
@@ -135,7 +135,6 @@ int fat_chain_add(struct inode *inode, int new_dclus, int nr_cluster)
 		}
 		if (ret < 0)
 			return ret;
-//		fat_cache_add(inode, new_fclus, new_dclus);
 	} else {
 		MSDOS_I(inode)->i_start = new_dclus;
 		MSDOS_I(inode)->i_logstart = new_dclus;
Signature · 1 line
1.7.7
maintainer
#1 lore raw

fs/fat/dir.c static int fat_add_new_entries(struct inode *dir, void *slots, int nr_slots, · line 1178

Quoted 13 lines · Ravishankar N

/*
- * 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,

fs/fat/dir.c +1 -1
 		    int name_len, struct fat_slot_info *sinfo)

@@ -1176,7 +1175,7 @@ static int fat_add_new_entries(struct inode *dir, void *slots, int nr_slots,
 
 	/*
 	 * The minimum cluster size is 512bytes, and maximum entry
-	 * size is 32*slots (672bytes).  So, iff the cluster size is
+	 * size is 32*slots (672bytes).  So, if the cluster size is

iff is right here. iff == if and only if

fs/fat/misc.c int fat_chain_add(struct inode *inode, int new_dclus, int nr_cluster) · line 138

Quoted 1 line
fs/fat/misc.c +0 -1
-//		fat_cache_add(inode, new_fclus, new_dclus);

I guess this still worth to keep as FIXME. This meant the following.

/*
* FIXME: Although we can add this cache, fat_cache_add() is assuming to
* be called after liner search with fat_cache_id.
*/

fs/fat/misc.c int fat_chain_add(struct inode *inode, int new_dclus, int nr_cluster) · line 140

Quoted 3 lines
fs/fat/misc.c +0 -0
 	} else {
 		MSDOS_I(inode)->i_start = new_dclus;
 		MSDOS_I(inode)->i_logstart = new_dclus;

Other parts looks fine.

Thanks.

Signature · 1 line
OGAWA Hirofumi <[email protected]>