X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yaffs_fs.c;h=99d082524d86a154652d3f4006c3245683724880;hp=775f3e878c6eda9b6c257c82c5c62f181da80b92;hb=14609dd277d69fdcddfb68bf465d06bb1cda82c7;hpb=2c76b6b85ece174f7c3dd47713367dbe0ea4d7e7 diff --git a/yaffs_fs.c b/yaffs_fs.c index 775f3e8..99d0825 100644 --- a/yaffs_fs.c +++ b/yaffs_fs.c @@ -30,7 +30,7 @@ */ -const char *yaffs_fs_c_version = "$Id: yaffs_fs.c,v 1.12 2005-07-27 20:23:15 charles Exp $"; +const char *yaffs_fs_c_version = "$Id: yaffs_fs.c,v 1.15 2005-07-29 23:51:18 luc Exp $"; extern const char *yaffs_guts_c_version; @@ -57,12 +57,13 @@ extern const char *yaffs_guts_c_version; #include #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 +#define BDEVNAME_SIZE 0 +#define yaffs_devname(sb, buf) kdevname(sb->s_dev) #endif @@ -154,13 +155,6 @@ static int yaffs_statfs(struct super_block *sb, struct statfs *buf); #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 *); @@ -911,6 +905,8 @@ static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode, int r 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) { @@ -936,18 +932,18 @@ static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode, int r // 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")); @@ -1083,13 +1079,15 @@ static int yaffs_symlink(struct inode * dir, struct dentry *dentry, const char * { 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); @@ -1316,6 +1314,7 @@ static struct super_block *yaffs_internal_read_super(int yaffsVersion,int useRam struct inode * inode = NULL; struct dentry * root; yaffs_Device *dev = 0; + char devname_buf[BDEVNAME_SIZE+1]; int err; sb->s_magic = YAFFS_MAGIC; @@ -1325,10 +1324,10 @@ static struct super_block *yaffs_internal_read_super(int yaffsVersion,int useRam 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)); @@ -1411,7 +1410,7 @@ static struct super_block *yaffs_internal_read_super(int yaffsVersion,int useRam 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) @@ -1605,29 +1604,15 @@ static struct super_block *yaffs_internal_read_super(int yaffsVersion,int useRam } -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_MTD_ENABLED + +#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) { @@ -1658,6 +1643,11 @@ static DECLARE_FSTYPE(yaffs_fs_type, "yaffs", yaffs_read_super, FS_REQUIRES_DEV) #ifdef CONFIG_YAFFS2_MTD_ENABLED #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) { @@ -1689,6 +1679,11 @@ static DECLARE_FSTYPE(yaffs2_fs_type, "yaffs2", yaffs2_read_super, FS_REQUIRES_D #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) { @@ -1717,6 +1712,11 @@ static DECLARE_FSTYPE(yaffs_ram_fs_type, "yaffsram", yaffs_ram_read_super, FS_SI #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) {