patch-1.3.60 linux/fs/umsdos/dir.c

Next file: linux/fs/umsdos/emd.c
Previous file: linux/fs/read_write.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.59/linux/fs/umsdos/dir.c linux/fs/umsdos/dir.c
@@ -152,7 +152,7 @@
 		bufk.dirbuf = dirbuf;
 		bufk.filldir = filldir;
 		bufk.count = 0;
-		ret = msdos_readdir(dir,filp,&bufk,umsdos_dir_once);
+		ret = fat_readdir(dir,filp,&bufk,umsdos_dir_once);
 		if (last_f_pos > 0 && filp->f_pos > last_f_pos) filp->f_pos = UMSDOS_SPECIAL_DIRFPOS;
 		if (u_entry != NULL) u_entry->flags = 0;
 	}else{
@@ -446,7 +446,7 @@
 		memcpy (d->entry->name,name,name_len);
 		d->entry->name[name_len] = '\0';
 		d->entry->name_len = name_len;
-		ret = 1;	/* So msdos_readdir will terminate */
+		ret = 1;	/* So fat_readdir will terminate */
 	}
 	return ret;
 }
@@ -484,7 +484,7 @@
 			filp.f_pos = 0;
 			bufk.entry = entry;
 			bufk.search_ino = inode->i_ino;
-			msdos_readdir (dir,&filp,&bufk,umsdos_dir_search);
+			fat_readdir (dir,&filp,&bufk,umsdos_dir_search);
 			if (bufk.found){
 				ret = 0;
 				inode->u.umsdos_i.i_dir_owner = dir->i_ino;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this