*/
-const char *yaffs_fs_c_version = "$Id: yaffs_fs.c,v 1.11 2005-07-26 23:04:34 charles Exp $";
+const char *yaffs_fs_c_version = "$Id: yaffs_fs.c,v 1.21 2005-08-01 20:49:38 luc Exp $";
extern const char *yaffs_guts_c_version;
-
#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <asm/statfs.h>
#define UnlockPage(p) unlock_page(p)
#define Page_Uptodate(page) test_bit(PG_uptodate, &(page)->flags)
-//#define kdevname(x) cdevname(to_kdev_t(x))
-#define kdevname(x) "(unavailable)" // temporary fix
+#define yaffs_devname(sb, buf) bdevname(sb->s_bdev, buf) // FIXME: use sb->s_id instead ?
#else
#include <linux/locks.h>
+#define BDEVNAME_SIZE 0
+#define yaffs_devname(sb, buf) kdevname(sb->s_dev)
#endif
#include "yaffs_nandemul2k.h"
#endif
-#ifdef CONFIG_YAFFS_MTD_ENABLED
+#ifdef CONFIG_YAFFS_YAFFS1
#include <linux/mtd/mtd.h>
#include "yaffs_mtdif.h"
#include "yaffs_mtdif2.h"
-#endif //CONFIG_YAFFS_MTD_ENABLED
+#endif //CONFIG_YAFFS_YAFFS1
//#define T(x) printk x
#endif
static void yaffs_read_inode (struct inode *inode);
-//#if defined(CONFIG_KERNEL_2_5)
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-static struct super_block *yaffs_read_super(struct file_system_type * fs, int flags, const char *dev_name, void *data);
-#else
-static struct super_block *yaffs_read_super(struct super_block * sb, void * data, int silent);
-#endif
-
static void yaffs_put_inode (struct inode *inode);
static void yaffs_delete_inode(struct inode *);
static void yaffs_clear_inode(struct inode *);
-
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,
-
- .mmap= generic_file_mmap,
- .flush= yaffs_file_flush,
- .fsync= yaffs_sync_object,
+ .read = generic_file_read,
+ .write = generic_file_write,
+ .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
+static struct inode_operations yaffs_symlink_inode_operations = {
+ .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,
- .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,
};
return inode;
}
-#if 0
-
-// No longer used because we use generic rw */
-static ssize_t yaffs_file_read(struct file *f, char *buf, size_t n, loff_t *pos)
-{
- yaffs_Object *obj;
- int nRead,ipos;
- struct inode *inode;
- yaffs_Device *dev;
-
- T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_file_read\n"));
-
- obj = yaffs_DentryToObject(f->f_dentry);
-
- dev = obj->myDev;
-
- yaffs_GrossLock(dev);
-
- inode = f->f_dentry->d_inode;
-
- if (*pos < inode->i_size)
- {
- if (*pos + n > inode->i_size)
- {
- n = inode->i_size - *pos;
- }
- }
- else
- {
- n = 0;
- }
-
- nRead = yaffs_ReadDataFromFile(obj,buf,*pos,n);
- if(nRead > 0)
- {
- f->f_pos += nRead;
- }
-
- yaffs_GrossUnlock(dev);
-
- ipos = *pos;
-
- T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_file_read read %d bytes, %d read at %d\n",n,nRead,ipos));
- return nRead;
-
-}
-
-#endif
-
static ssize_t yaffs_file_write(struct file *f, const char *buf, size_t n, loff_t *pos)
{
yaffs_Object *obj;
yaffs_Object *parent = yaffs_InodeToObject(dir);
int error = -ENOSPC;
+ uid_t uid = current->fsuid;
+ gid_t gid = (dir->i_mode & S_ISGID) ? dir->i_gid : current->fsgid;
if(parent)
{
// Special (socket, fifo, device...)
T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_mknod: making special\n"));
#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
- obj = yaffs_MknodSpecial(parent,dentry->d_name.name,mode,current->uid, current->gid,old_encode_dev(rdev));
+ obj = yaffs_MknodSpecial(parent,dentry->d_name.name,mode,uid, gid,old_encode_dev(rdev));
#else
- obj = yaffs_MknodSpecial(parent,dentry->d_name.name,mode,current->uid, current->gid,rdev);
+ obj = yaffs_MknodSpecial(parent,dentry->d_name.name,mode,uid, gid,rdev);
#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);
+ obj = yaffs_MknodFile(parent,dentry->d_name.name,mode,uid, gid);
break;
case S_IFDIR: // directory
T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_mknod: making directory\n"));
- obj = yaffs_MknodDirectory(parent,dentry->d_name.name,mode,current->uid, current->gid);
+ obj = yaffs_MknodDirectory(parent,dentry->d_name.name,mode,uid, gid);
break;
case S_IFLNK: // symlink
T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_mknod: making file\n"));
{
yaffs_Object *obj;
yaffs_Device *dev;
+ uid_t uid = current->fsuid;
+ gid_t gid = (dir->i_mode & S_ISGID) ? dir->i_gid : current->fsgid;
T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_symlink\n"));
dev = yaffs_InodeToObject(dir)->myDev;
yaffs_GrossLock(dev);
obj = yaffs_MknodSymLink(yaffs_InodeToObject(dir), dentry->d_name.name,
- S_IFLNK | S_IRWXUGO, current->uid, current->gid,
+ S_IFLNK | S_IRWXUGO, uid, gid,
symname);
yaffs_GrossUnlock(dev);
}
-#ifdef CONFIG_YAFFS_MTD_ENABLED
+#ifdef CONFIG_YAFFS_YAFFS1
static void yaffs_MTDPutSuper(struct super_block *sb)
{
struct inode * inode = NULL;
struct dentry * root;
yaffs_Device *dev = 0;
+ char devname_buf[BDEVNAME_SIZE+1];
int err;
sb->s_magic = YAFFS_MAGIC;
printk(KERN_INFO"yaffs: sb is NULL\n");
else if(!sb->s_dev)
printk(KERN_INFO"yaffs: sb->s_dev is NULL\n");
- else if(! kdevname(sb->s_dev))
- printk(KERN_INFO"yaffs: kdevname is NULL\n");
+ else if(!yaffs_devname(sb, devname_buf))
+ printk(KERN_INFO"yaffs: devname is NULL\n");
else
- printk(KERN_INFO"yaffs: dev is %d name is \"%s\"\n", sb->s_dev, kdevname(sb->s_dev));
+ printk(KERN_INFO"yaffs: dev is %d name is \"%s\"\n", sb->s_dev, yaffs_devname(sb, devname_buf));
-#ifdef CONFIG_YAFFS_USE_CHUNK_SIZE
- sb->s_blocksize = YAFFS_BYTES_PER_CHUNK;
- sb->s_blocksize_bits = YAFFS_CHUNK_SIZE_SHIFT;
-#else
sb->s_blocksize = PAGE_CACHE_SIZE;
sb->s_blocksize_bits = PAGE_CACHE_SHIFT;
-#endif
T(YAFFS_TRACE_OS,("yaffs_read_super: Using yaffs%d\n",yaffsVersion));
T(YAFFS_TRACE_OS,("yaffs_read_super: %s block size %d\n", useRam ? "RAM" : "MTD",(int)(sb->s_blocksize)));
}
else
{
-#ifdef CONFIG_YAFFS_MTD_ENABLED
+#if defined(CONFIG_YAFFS_YAFFS1) || defined(CONFIG_YAFFS_YAFFS2)
struct mtd_info *mtd;
T(YAFFS_TRACE_ALWAYS,("yaffs: Attempting MTD mount on %u.%u, \"%s\"\n",
- MAJOR(sb->s_dev),MINOR(sb->s_dev),kdevname(sb->s_dev)));
+ MAJOR(sb->s_dev),MINOR(sb->s_dev), yaffs_devname(sb, devname_buf)));
// Check it's an mtd device.....
if(MAJOR(sb->s_dev) != MTD_BLOCK_MAJOR)
}
-static int yaffs_internal_read_super_ram(struct super_block * sb, void * data, int silent)
-{
- return yaffs_internal_read_super(1,1,sb,data,silent) ? 0 : -1;
-}
+
+#ifdef CONFIG_YAFFS_YAFFS1
+
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
static int yaffs_internal_read_super_mtd(struct super_block * sb, void * data, int silent)
{
return yaffs_internal_read_super(1,0,sb,data,silent) ? 0 : -1;
}
-static int yaffs2_internal_read_super_ram(struct super_block * sb, void * data, int silent)
-{
- return yaffs_internal_read_super(2,1,sb,data,silent) ? 0 : -1;
-}
-static int yaffs2_internal_read_super_mtd(struct super_block * sb, void * data, int silent)
-{
- return yaffs_internal_read_super(2,0,sb,data,silent) ? 0 : -1;
-}
-
-
-
-#ifdef CONFIG_YAFFS_MTD_ENABLED
-//#if defined(CONFIG_KERNEL_2_5)
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
static struct super_block *yaffs_read_super(struct file_system_type * fs, int flags, const char *dev_name, void *data)
{
static DECLARE_FSTYPE(yaffs_fs_type, "yaffs", yaffs_read_super, FS_REQUIRES_DEV);
#endif
-#endif // CONFIG_YAFFS_MTD_ENABLED
+#endif // CONFIG_YAFFS_YAFFS1
-#ifdef CONFIG_YAFFS2_MTD_ENABLED
+#ifdef CONFIG_YAFFS_YAFFS2
#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
+static int yaffs2_internal_read_super_mtd(struct super_block * sb, void * data, int silent)
+{
+ return yaffs_internal_read_super(2,0,sb,data,silent) ? 0 : -1;
+}
+
static struct super_block *yaffs2_read_super(struct file_system_type * fs, int flags, const char *dev_name, void *data)
{
static DECLARE_FSTYPE(yaffs2_fs_type, "yaffs2", yaffs2_read_super, FS_REQUIRES_DEV);
#endif
-#endif // CONFIG_YAFFS2_MTD_ENABLED
+#endif // CONFIG_YAFFS_YAFFS2
#ifdef CONFIG_YAFFS_RAM_ENABLED
#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
+static int yaffs_internal_read_super_ram(struct super_block * sb, void * data, int silent)
+{
+ return yaffs_internal_read_super(1,1,sb,data,silent) ? 0 : -1;
+}
+
static struct super_block *yaffs_ram_read_super(struct file_system_type * fs, int flags, const char *dev_name, void *data)
{
#ifdef CONFIG_YAFFS2_RAM_ENABLED
#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
+static int yaffs2_internal_read_super_ram(struct super_block * sb, void * data, int silent)
+{
+ return yaffs_internal_read_super(2,1,sb,data,silent) ? 0 : -1;
+}
+
static struct super_block *yaffs2_ram_read_super(struct file_system_type * fs, int flags, const char *dev_name, void *data)
{
static struct proc_dir_entry *my_proc_entry;
-static struct proc_dir_entry *my_proc_ram_write_entry;
static char * yaffs_dump_dev(char *buf,yaffs_Device *dev)
{
return buf-page < count ? buf-page : count;
}
+#ifdef CONFIG_YAFFS2_RAM_ENABLED
static int yaffs_proc_ram_write(
char *page,
char **start,
printk(KERN_DEBUG "yaffs write size %d\n",count);
return count;
}
-
-
+#endif
// Stuff to handle installation of file systems
struct file_system_to_install
#ifdef CONFIG_YAFFS2_RAM_ENABLED
{ &yaffs2_ram_fs_type,0},
#endif
-#ifdef CONFIG_YAFFS_MTD_ENABLED
+#ifdef CONFIG_YAFFS_YAFFS1
{ &yaffs_fs_type,0},
#endif
-#ifdef CONFIG_YAFFS2_MTD_ENABLED
+#ifdef CONFIG_YAFFS_YAFFS2
{ &yaffs2_fs_type,0},
#endif
{ NULL,0}
projects / yaffs2.git / blobdiff