patch-2.4.0-test11 linux/fs/umsdos/emd.c

• Lines: 36
• Date: Wed Nov 8 19:01:34 2000
• Orig file: v2.4.0-test10/linux/fs/umsdos/emd.c
• Orig date: Tue Sep 5 14:05:45 2000

diff -u --recursive --new-file v2.4.0-test10/linux/fs/umsdos/emd.c linux/fs/umsdos/emd.c
@@ -129,7 +129,7 @@
 	wait_on_page(page);
 	if (!Page_Uptodate(page))
 		goto async_fail;
-	p = (struct umsdos_dirent*)((char*)kmap(page)+offs);
+	p = (struct umsdos_dirent*)(kmap(page)+offs);
 
 	/* if this is an invalid entry (invalid name length), ignore it */
 	if( p->name_len > UMSDOS_MAXNAME )
@@ -158,7 +158,7 @@
 			goto async_fail;
 		}
 		memcpy(entry->spare,p->spare,part);
-		memcpy(entry->spare+part,(char*)kmap(page2),
+		memcpy(entry->spare+part,kmap(page2),
 				recsize+offs-PAGE_CACHE_SIZE);
 		kunmap(page2);
 		page_cache_release(page2);
@@ -399,7 +399,7 @@
 			wait_on_page(page);
 			if (!Page_Uptodate(page))
 				goto async_fail;
-			p = (char*)kmap(page);
+			p = kmap(page);
 		}
 
 		rentry = (struct umsdos_dirent *)(p+offs);
@@ -451,7 +451,7 @@
 				page = next_page;
 				goto async_fail;
 			}
-			q = (char*)kmap(next_page);
+			q = kmap(next_page);
 			if (memcmp(entry->name, rentry->name, len) ||
 			    memcmp(entry->name+len, q, entry->name_len-len)) {
 				kunmap(next_page);