applied patch 14-sparse-fix--remove-unused.diff

[yaffs2.git] / yaffs_fs.c

diff --git a/yaffs_fs.c b/yaffs_fs.c
index b4717f1d913efbf694e29289ab3f7eec629e37c5..ca7839136474a7dee097387f6059179415c9e4f5 100644 (file)
--- a/yaffs_fs.c
+++ b/yaffs_fs.c
@@ -30,11 +30,10 @@
  */
 
 
  */
 
 

-const char *yaffs_fs_c_version = "$Id: yaffs_fs.c,v 1.13 2005-07-29 20:13:23 luc Exp $";
+const char *yaffs_fs_c_version = "$Id: yaffs_fs.c,v 1.18 2005-07-31 04:09:26 marty Exp $";

 extern const char *yaffs_guts_c_version;
 
 
 extern const char *yaffs_guts_c_version;
 
 

-

 #include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/module.h>


@@ -57,12 +56,13 @@ extern const char *yaffs_guts_c_version;
 #include <asm/statfs.h>
 #define UnlockPage(p) unlock_page(p)
 #define Page_Uptodate(page)    test_bit(PG_uptodate, &(page)->flags)
 #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>
 
 #else
 
 #include <linux/locks.h>

+#define        BDEVNAME_SIZE           0
+#define        yaffs_devname(sb, buf)  kdevname(sb->s_dev)

 
 #endif
 
 
 #endif
 


@@ -191,7 +191,7 @@ static struct inode_operations yaffs_file_inode_operations = {
        .setattr        = yaffs_setattr,
 };
 
        .setattr        = yaffs_setattr,
 };
 

-struct inode_operations yaffs_symlink_inode_operations = {     
+static 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,


@@ -904,6 +904,8 @@ static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode, int r
        yaffs_Object *parent = yaffs_InodeToObject(dir);
        
        int error = -ENOSPC;
        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)
        {
 
        if(parent)
        {


@@ -929,18 +931,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))
                        // 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
 #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"));
 #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"));
                        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"));
                        break;
                case S_IFLNK:   // symlink
                        T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_mknod: making file\n"));


@@ -1076,13 +1078,15 @@ static int yaffs_symlink(struct inode * dir, struct dentry *dentry, const char *
 {
        yaffs_Object *obj;
        yaffs_Device *dev;
 {
        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, 
        
        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);
 
                                                         symname);
        yaffs_GrossUnlock(dev);
 


@@ -1309,6 +1313,7 @@ static struct super_block *yaffs_internal_read_super(int yaffsVersion,int useRam
        struct inode * inode = NULL;
        struct dentry * root;
        yaffs_Device *dev = 0;
        struct inode * inode = NULL;
        struct dentry * root;
        yaffs_Device *dev = 0;

+       char devname_buf[BDEVNAME_SIZE+1];

        int err;
        
        sb->s_magic = YAFFS_MAGIC;
        int err;
        
        sb->s_magic = YAFFS_MAGIC;


@@ -1318,10 +1323,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");
                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
        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));

 
        
 
 
        
 


@@ -1400,11 +1405,11 @@ static struct super_block *yaffs_internal_read_super(int yaffsVersion,int useRam
        }
        else
        {       
        }
        else
        {       

-#ifdef CONFIG_YAFFS_MTD_ENABLED
+#if defined(CONFIG_YAFFS_MTD_ENABLED) || defined(CONFIG_YAFFS2_MTD_ENABLED)

                struct mtd_info *mtd;
                
                T(YAFFS_TRACE_ALWAYS,("yaffs: Attempting MTD mount on %u.%u, \"%s\"\n",
                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)
                        
                // Check it's an mtd device.....
                if(MAJOR(sb->s_dev) != MTD_BLOCK_MAJOR)


@@ -1739,7 +1744,6 @@ static DECLARE_FSTYPE(yaffs2_ram_fs_type, "yaffs2ram", yaffs2_ram_read_super, FS
 
 
 static struct proc_dir_entry *my_proc_entry;
 
 
 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)
 {
 
 static char * yaffs_dump_dev(char *buf,yaffs_Device *dev)
 {