diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-08-08 19:25:53 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-08-08 19:25:53 +0000 |
| commit | 57445428488a2862840c4d7c96d7746c11031aaf (patch) | |
| tree | 60b88b3a21896a33ee4dccc727d88b745a9ff731 /fs/umsdos | |
| parent | 2e837819b1563679b55363d469239fdf4f17fbbb (diff) | |
Merge with Linu 2.4.0-test6-pre6.
Diffstat (limited to 'fs/umsdos')
| -rw-r--r-- | fs/umsdos/emd.c | 8 | ||||
| -rw-r--r-- | fs/umsdos/inode.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/fs/umsdos/emd.c b/fs/umsdos/emd.c index 9e4ace724..a8de0def8 100644 --- a/fs/umsdos/emd.c +++ b/fs/umsdos/emd.c @@ -142,7 +142,7 @@ int umsdos_emd_dir_readentry (struct dentry *demd, loff_t *pos, struct umsdos_di recsize = umsdos_evalrecsize(p->name_len); if (offs + recsize > PAGE_CACHE_SIZE) { struct page *page2; - int part = ((char*)page_address(page)+PAGE_CACHE_SIZE)-p->spare; + int part = (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)) { @@ -236,7 +236,7 @@ int umsdos_writeentry (struct dentry *parent, struct umsdos_info *info, page = grab_cache_page(mapping, info->f_pos>>PAGE_CACHE_SHIFT); if (!page) goto out_dput; - p = (struct umsdos_dirent*)((char*)page_address(page)+offs); + p = (struct umsdos_dirent *) (page_address(page) + offs); if (offs + info->recsize > PAGE_CACHE_SIZE) { ret = mapping->a_ops->prepare_write(NULL,page,offs, PAGE_CACHE_SIZE); @@ -261,8 +261,8 @@ int umsdos_writeentry (struct dentry *parent, struct umsdos_info *info, p->rdev = cpu_to_le16(entry->rdev); p->mode = cpu_to_le16(entry->mode); memcpy(p->name,entry->name, - ((char*)page_address(page)+PAGE_CACHE_SIZE)-p->spare); - memcpy((char*)page_address(page2), + (page_address(page) + PAGE_CACHE_SIZE) - p->spare); + memcpy(page_address(page2), entry->spare+PAGE_CACHE_SIZE-offs, offs+info->recsize-PAGE_CACHE_SIZE); ret = mapping->a_ops->commit_write(NULL,page2,0, diff --git a/fs/umsdos/inode.c b/fs/umsdos/inode.c index 12b34e849..4aebe9bda 100644 --- a/fs/umsdos/inode.c +++ b/fs/umsdos/inode.c @@ -230,7 +230,7 @@ dentry->d_parent->d_name.name, dentry->d_name.name, inode->u.umsdos_i.i_patched) ret=mapping->a_ops->prepare_write(NULL,page,offs,offs+UMSDOS_REC_SIZE); if (ret) goto out_unlock; - entry = (struct umsdos_dirent*)((char*)page_address(page)+offs); + entry = (struct umsdos_dirent *) (page_address(page) + offs); if (attr->ia_valid & ATTR_UID) entry->uid = cpu_to_le16(attr->ia_uid); if (attr->ia_valid & ATTR_GID) |