Re: umsdos still broken in test7

From: Francois romieu (romieu@ensta.fr)
Date: Thu Aug 24 2000 - 16:22:50 EST


The Thu, Aug 24, 2000 at 04:06:10PM -0400, Nadeem Riaz wrote :
[...]
> Just to let you know, umsdos is still broken in 2.4.0-test7,
> I believe the last kernel it worked in was 2.4.0-test5 or test4. I
> tried compiling it as a module and this is the error message I got.

Bernd Jendrissek sent a patch a few days ago (test7 version here). Not
tested here but it compiles fine.

diff -u --recursive linux-2.4.0-test7.orig/fs/umsdos/emd.c linux-2.4.0-test7/fs/umsdos/emd.c
--- linux-2.4.0-test7.orig/fs/umsdos/emd.c Sun Aug 6 18:43:18 2000
+++ linux-2.4.0-test7/fs/umsdos/emd.c Thu Aug 24 08:41:20 2000
@@ -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 = (page_address(page) + PAGE_CACHE_SIZE) - (void *)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);
+ (page_address(page) + PAGE_CACHE_SIZE) - (void *)p->spare);
                 memcpy(page_address(page2),
                                 entry->spare+PAGE_CACHE_SIZE-offs,
                                 offs+info->recsize-PAGE_CACHE_SIZE);

-- 
Ueimor
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
Please read the FAQ at http://www.tux.org/lkml/



This archive was generated by hypermail 2b29 : Thu Aug 31 2000 - 21:00:14 EST