patch-2.3.3 linux/fs/hpfs/dentry.c

Next file: linux/fs/hpfs/dir.c
Previous file: linux/fs/hpfs/alloc.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.2/linux/fs/hpfs/dentry.c linux/fs/hpfs/dentry.c
@@ -16,14 +16,14 @@
 {
 	unsigned long	 hash;
 	int		 i;
-	int l = qstr->len;
+	unsigned l = qstr->len;
 
 	if (l == 1) if (qstr->name[0]=='.') goto x;
 	if (l == 2) if (qstr->name[0]=='.' || qstr->name[1]=='.') goto x;
-	if (hpfs_chk_name((char *)qstr->name,l))
-		/*return -ENAMETOOLONG;*/
-		return -ENOENT;
 	hpfs_adjust_length((char *)qstr->name, &l);
+	/*if (hpfs_chk_name((char *)qstr->name,&l))*/
+		/*return -ENAMETOOLONG;*/
+		/*return -ENOENT;*/
 	x:
 
 	hash = init_name_hash();
@@ -36,15 +36,15 @@
 
 int hpfs_compare_dentry(struct dentry *dentry, struct qstr *a, struct qstr *b)
 {
-	int al=a->len;
-	int bl=b->len;
+	unsigned al=a->len;
+	unsigned bl=b->len;
 	hpfs_adjust_length((char *)a->name, &al);
-	hpfs_adjust_length((char *)b->name, &bl);
+	/*hpfs_adjust_length((char *)b->name, &bl);*/
 	/* 'a' is the qstr of an already existing dentry, so the name
 	 * must be valid. 'b' must be validated first.
 	 */
 
-	if (hpfs_chk_name((char *)b->name, bl)) return 1;
+	if (hpfs_chk_name((char *)b->name, &bl)) return 1;
 	if (hpfs_compare_names(dentry->d_sb, (char *)a->name, al, (char *)b->name, bl, 0)) return 1;
 	return 0;
 }

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)