X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yaffs_fs.c;h=2639e9fc39334aadf04e88b726b177833f2eeb48;hp=e8713b35f9bad42825ac47f05afa43d9dd3efd08;hb=dc10a95f27049afbcee274da78fcb9c3dc08dd23;hpb=f183112d642f4ce96514ae2c60cca8238ad89b8b

diff --git a/yaffs_fs.c b/yaffs_fs.c
index e8713b3..2639e9f 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.11 2005-07-26 23:04:34 charles Exp $";
+const char *yaffs_fs_c_version = "$Id: yaffs_fs.c,v 1.14 2005-07-29 20:25:43 luc Exp $";
 extern const char *yaffs_guts_c_version;
 
 
@@ -154,13 +154,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 *);
@@ -179,65 +172,57 @@ 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,
-
-	.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
+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,
 };
 
 
@@ -919,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;
+	uid_t uid = current->fsuid;
+	gid_t gid = (dir->i_mode & S_ISGID) ? dir->i_gid : current->fsgid;
 
 	if(parent)
 	{
@@ -944,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))
-                        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"));
@@ -1091,13 +1078,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);
 
@@ -1613,29 +1602,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)
 {
 
@@ -1666,6 +1641,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)
 {
 
@@ -1697,6 +1677,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)
 {
 
@@ -1725,6 +1710,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)
 {