diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-11-28 03:58:46 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-11-28 03:58:46 +0000 |
| commit | b63ad0882a16a5d28003e57f2b0b81dee3fb322b (patch) | |
| tree | 0a343ce219e2b8b38a5d702d66032c57b83d9720 /fs/ramfs | |
| parent | a9d7bff9a84dba79609a0002e5321b74c4d64c64 (diff) | |
Merge with 2.4.0-test11.
Diffstat (limited to 'fs/ramfs')
| -rw-r--r-- | fs/ramfs/inode.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/fs/ramfs/inode.c b/fs/ramfs/inode.c index f13ba4f3d..31461669c 100644 --- a/fs/ramfs/inode.c +++ b/fs/ramfs/inode.c @@ -65,7 +65,8 @@ static struct dentry * ramfs_lookup(struct inode *dir, struct dentry *dentry) static int ramfs_readpage(struct file *file, struct page * page) { if (!Page_Uptodate(page)) { - memset(page_address(page), 0, PAGE_CACHE_SIZE); + memset(kmap(page), 0, PAGE_CACHE_SIZE); + kunmap(page); flush_dcache_page(page); SetPageUptodate(page); } @@ -85,9 +86,7 @@ static int ramfs_writepage(struct file *file, struct page *page) static int ramfs_prepare_write(struct file *file, struct page *page, unsigned offset, unsigned to) { - void *addr; - - addr = (void *) kmap(page); + void *addr = kmap(page); if (!Page_Uptodate(page)) { memset(addr, 0, PAGE_CACHE_SIZE); flush_dcache_page(page); @@ -110,21 +109,15 @@ static int ramfs_commit_write(struct file *file, struct page *page, unsigned off struct inode *ramfs_get_inode(struct super_block *sb, int mode, int dev) { - struct inode * inode = get_empty_inode(); + struct inode * inode = new_inode(sb); if (inode) { - inode->i_sb = sb; - inode->i_dev = sb->s_dev; inode->i_mode = mode; inode->i_uid = current->fsuid; inode->i_gid = current->fsgid; - inode->i_size = 0; inode->i_blksize = PAGE_CACHE_SIZE; inode->i_blocks = 0; inode->i_rdev = to_kdev_t(dev); - inode->i_nlink = 1; - inode->i_op = NULL; - inode->i_fop = NULL; inode->i_mapping->a_ops = &ramfs_aops; inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME; switch (mode & S_IFMT) { |