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

• Lines: 54
• Date: Tue Sep 5 14:05:45 2000
• Orig file: v2.4.0-test7/linux/fs/umsdos/emd.c
• Orig date: Wed Aug 9 19:19:51 2000

diff -u --recursive --new-file v2.4.0-test7/linux/fs/umsdos/emd.c linux/fs/umsdos/emd.c
@@ -142,7 +142,7 @@
 	recsize = umsdos_evalrecsize(p->name_len);
 	if (offs + recsize > PAGE_CACHE_SIZE) {
 		struct page *page2;
-		int part = (page_address(page) + PAGE_CACHE_SIZE) - p->spare;
+		int part = (char *)(page_address(page) + PAGE_CACHE_SIZE) - p->spare;
 		page2 = read_cache_page(mapping, 1+(*pos>>PAGE_CACHE_SHIFT),
 				(filler_t*)mapping->a_ops->readpage, NULL);
 		if (IS_ERR(page2)) {
@@ -261,7 +261,7 @@
 		p->rdev = cpu_to_le16(entry->rdev);
 		p->mode = cpu_to_le16(entry->mode);
 		memcpy(p->name,entry->name,
-			(page_address(page) + PAGE_CACHE_SIZE) - p->spare);
+			(char *)(page_address(page) + PAGE_CACHE_SIZE) - p->spare);
 		memcpy(page_address(page2),
 				entry->spare+PAGE_CACHE_SIZE-offs,
 				offs+info->recsize-PAGE_CACHE_SIZE);
@@ -505,7 +505,7 @@
 	struct dentry *demd = umsdos_get_emd_dentry(parent);
 
 	ret = PTR_ERR(demd);
-	if (IS_ERR(ret))
+	if (IS_ERR(demd))
 		goto out;
 	err = umsdos_find (demd, info);
 	if (err && err == -ENOENT) {
@@ -532,7 +532,7 @@
 	int ret;
 	struct dentry *demd = umsdos_get_emd_dentry(parent);
 	ret = PTR_ERR(demd);
-	if (IS_ERR(ret))
+	if (IS_ERR(demd))
 		goto out;
 
 	umsdos_parse ("..LINK", 6, info);
@@ -561,7 +561,7 @@
 	struct dentry *demd = umsdos_get_emd_dentry(parent);
 
 	ret = PTR_ERR(demd);
-	if (IS_ERR(ret))
+	if (IS_ERR(demd))
 		goto out;
 	ret = umsdos_find (demd, info);
 	if (ret)
@@ -642,7 +642,7 @@
 	struct dentry *demd = umsdos_get_emd_dentry(parent);
 
 	ret = PTR_ERR(demd);
-	if (IS_ERR(ret))
+	if (IS_ERR(demd))
 		goto out;
 	ret = umsdos_find (demd, info);
 	if (ret)