*/
-const char *yaffs_fs_c_version = "$Id: yaffs_fs.c,v 1.8 2005-07-18 23:16:04 charles Exp $";
+const char *yaffs_fs_c_version = "$Id: yaffs_fs.c,v 1.9 2005-07-19 20:41:59 charles Exp $";
extern const char *yaffs_guts_c_version;
static void yaffs_clear_inode(struct inode *);
static int yaffs_readpage(struct file *file, struct page * page);
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
+static int yaffs_writepage(struct page *page, struct writeback_control *wbc);
+#else
static int yaffs_writepage(struct page *page);
+#endif
static int yaffs_prepare_write(struct file *f, struct page *pg, unsigned offset, unsigned to);
static int yaffs_commit_write(struct file *f, struct page *pg, unsigned offset, unsigned to);
-static int yaffs_readlink(struct dentry *dentry, char *buffer, int buflen);
+static int yaffs_readlink(struct dentry *dentry, char __user *buffer, int buflen);
static int yaffs_follow_link(struct dentry *dentry, struct nameidata *nd);
static struct address_space_operations yaffs_file_address_operations = {
- readpage: yaffs_readpage,
- writepage: yaffs_writepage,
- prepare_write: yaffs_prepare_write,
- commit_write: yaffs_commit_write
+ .readpage: yaffs_readpage,
+ .writepage: yaffs_writepage,
+ .prepare_write: yaffs_prepare_write,
+ .commit_write: yaffs_commit_write
};
static struct file_operations yaffs_file_operations = {
- read: generic_file_read,
- write: generic_file_write,
+ .read: generic_file_read,
+ .write: generic_file_write,
- mmap: generic_file_mmap,
- flush: yaffs_file_flush,
- fsync: yaffs_sync_object,
+ .mmap: generic_file_mmap,
+ .flush: yaffs_file_flush,
+ .fsync: yaffs_sync_object,
};
static struct inode_operations yaffs_file_inode_operations = {
- setattr: yaffs_setattr,
+ .setattr: yaffs_setattr,
};
struct inode_operations yaffs_symlink_inode_operations =
{
- readlink: yaffs_readlink,
- follow_link: yaffs_follow_link,
- setattr: yaffs_setattr
+ .readlink: yaffs_readlink,
+ .follow_link: yaffs_follow_link,
+ .setattr: yaffs_setattr
};
static struct inode_operations yaffs_dir_inode_operations = {
- create: yaffs_create,
- lookup: yaffs_lookup,
- link: yaffs_link,
- unlink: yaffs_unlink,
- symlink: yaffs_symlink,
- mkdir: yaffs_mkdir,
- rmdir: yaffs_unlink,
- mknod: yaffs_mknod,
- rename: yaffs_rename,
- setattr: yaffs_setattr,
+ .create: yaffs_create,
+ .lookup: yaffs_lookup,
+ .link: yaffs_link,
+ .unlink: yaffs_unlink,
+ .symlink: yaffs_symlink,
+ .mkdir: yaffs_mkdir,
+ .rmdir: yaffs_unlink,
+ .mknod: yaffs_mknod,
+ .rename: yaffs_rename,
+ .setattr: yaffs_setattr,
};
static struct file_operations yaffs_dir_operations = {
- read: generic_read_dir,
- readdir: yaffs_readdir,
- fsync: yaffs_sync_object,
+ .read: generic_read_dir,
+ .readdir: yaffs_readdir,
+ .fsync: yaffs_sync_object,
};
static struct super_operations yaffs_super_ops = {
- statfs: yaffs_statfs,
- read_inode: yaffs_read_inode,
- put_inode: yaffs_put_inode,
- put_super: yaffs_put_super,
-// remount_fs:
- delete_inode: yaffs_delete_inode,
- clear_inode: yaffs_clear_inode,
+ .statfs: yaffs_statfs,
+ .read_inode: yaffs_read_inode,
+ .put_inode: yaffs_put_inode,
+ .put_super: yaffs_put_super,
+ .delete_inode: yaffs_delete_inode,
+ .clear_inode: yaffs_clear_inode,
};
}
-static int yaffs_readlink(struct dentry *dentry, char *buffer, int buflen)
+static int yaffs_readlink(struct dentry *dentry, char __user *buffer, int buflen)
{
unsigned char *alias;
int ret;
dev = obj->myDev;
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
+ BUG_ON(!PageLocked(pg));
+#else
if (!PageLocked(pg))
PAGE_BUG(pg);
+#endif
pg_buf = kmap(pg);
/* FIXME: Can kmap fail? */
// writepage inspired by/stolen from smbfs
//
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
+static int yaffs_writepage(struct page *page, struct writeback_control *wbc)
+#else
static int yaffs_writepage(struct page *page)
+#endif
{
struct address_space *mapping = page->mapping;
struct inode *inode;
init_special_inode(inode, obj->yst_mode,old_decode_dev(obj->yst_rdev));
#else
init_special_inode(inode, obj->yst_mode,(dev_t)(obj->yst_rdev));
-#endif break;
+#endif
+ break;
case S_IFREG: // file
inode->i_op = &yaffs_file_inode_operations;
inode->i_fop = &yaffs_file_operations;
obj = yaffs_MknodSpecial(parent,dentry->d_name.name,mode,current->uid, current->gid,old_encode_dev(rdev));
#else
obj = yaffs_MknodSpecial(parent,dentry->d_name.name,mode,current->uid, current->gid,rdev);
-#endif break;
+#endif
+ break;
case S_IFREG: // file
T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_mknod: making file\n"));
obj = yaffs_MknodFile(parent,dentry->d_name.name,mode,current->uid, current->gid);
error = -EPERM;
}
yaffs_GrossUnlock(dev);
- error = inode_setattr(inode,attr);
+ if (!error)
+ error = inode_setattr(inode,attr);
}
return error;
}
return NULL;
}
- T(YAFFS_TRACE_OS,(" erase %x\n",mtd->erase));
- T(YAFFS_TRACE_OS,(" read %x\n",mtd->read));
- T(YAFFS_TRACE_OS,(" write %x\n",mtd->write));
- T(YAFFS_TRACE_OS,(" readoob %x\n",mtd->read_oob));
- T(YAFFS_TRACE_OS,(" writeoob %x\n",mtd->write_oob));
- T(YAFFS_TRACE_OS,(" block_isbad %x\n",mtd->block_isbad));
- T(YAFFS_TRACE_OS,(" block_markbad %x\n",mtd->block_markbad));
+ T(YAFFS_TRACE_OS,(" erase %p\n",mtd->erase));
+ T(YAFFS_TRACE_OS,(" read %p\n",mtd->read));
+ T(YAFFS_TRACE_OS,(" write %p\n",mtd->write));
+ T(YAFFS_TRACE_OS,(" readoob %p\n",mtd->read_oob));
+ T(YAFFS_TRACE_OS,(" writeoob %p\n",mtd->write_oob));
+ T(YAFFS_TRACE_OS,(" block_isbad %p\n",mtd->block_isbad));
+ T(YAFFS_TRACE_OS,(" block_markbad %p\n",mtd->block_markbad));
T(YAFFS_TRACE_OS,(" oobblock %d\n",mtd->oobblock));
T(YAFFS_TRACE_OS,(" oobsize %d\n",mtd->oobsize));
T(YAFFS_TRACE_OS,(" erasesize %d\n",mtd->erasesize));
static struct super_block *yaffs_ram_read_super(struct file_system_type * fs, int flags, const char *dev_name, void *data)
{
- return get_sb_bdev(fs, flags, dev_name, data, yaffs_internal_read_super_ram);
+ return get_sb_nodev(fs, flags, data, yaffs_internal_read_super_ram);
}
.owner = THIS_MODULE,
.name = "yaffsram",
.get_sb = yaffs_ram_read_super,
- .kill_sb = kill_block_super,
-// .kill_sb = kill_litter_super,
+ .kill_sb = kill_litter_super,
.fs_flags = 0 ,
};
#else
static struct super_block *yaffs2_ram_read_super(struct file_system_type * fs, int flags, const char *dev_name, void *data)
{
- return get_sb_bdev(fs, flags, dev_name, data, yaffs2_internal_read_super_ram);
+ return get_sb_nodev(fs, flags, data, yaffs2_internal_read_super_ram);
}
.owner = THIS_MODULE,
.name = "yaffs2ram",
.get_sb = yaffs2_ram_read_super,
- .kill_sb = kill_block_super,
-// .kill_sb = kill_litter_super,
+ .kill_sb = kill_litter_super,
.fs_flags = 0 ,
};
#else