umsdos FS in 2.6.x

diff -Naurp linux-260-test8-efs/include/linux/umsdos_fs_i.h linux-260-test8/include/linux/umsdos_fs_i.h
@@ -55,4 +55,8 @@ struct umsdos_inode_info {
 	off_t pos;		/* Entry offset in the emd_owner file */
 };
 
+static inline struct umsdos_inode_info *UMSDOS_I(struct inode *inode)
+{
+	return (struct umsdos_inode_info *)inode->u.generic_ip;
+}
 #endif

163 lines not on this page · raw message

diff -Naurp linux-260-test8-efs/fs/umsdos/ioctl.c linux-260-test8/fs/umsdos/ioctl.c
@@ -402,9 +402,10 @@ new_dentry->d_parent->d_name.name, new_d
 			data.stat.st_ino = inode->i_ino;
 			data.stat.st_mode = inode->i_mode;
 			data.stat.st_size = inode->i_size;
-			data.stat.st_atime = inode->i_atime;
-			data.stat.st_ctime = inode->i_ctime;
-			data.stat.st_mtime = inode->i_mtime;
+			/* TBD: fix times */
+			///data.stat.st_atime = inode->i_atime;
+			///data.stat.st_ctime = inode->i_ctime;
+			///data.stat.st_mtime = inode->i_mtime;
 			ret = -EFAULT;
 			if (!copy_to_user (&idata->stat, &data.stat, 
 						sizeof (data.stat)))

@@ -414,6 +415,7 @@ new_dentry->d_parent->d_name.name, new_d
 		goto out;
 	}
 	else if (cmd == UMSDOS_DOS_SETUP) {
+		struct msdos_sb_info *msdossbi = (struct msdos_sb_info *)dir->i_sb->s_fs_info;
 		/* #Specification: ioctl / UMSDOS_DOS_SETUP
 		 * The UMSDOS_DOS_SETUP ioctl allow changing the
 		 * default permission of the MS-DOS filesystem driver

@@ -433,10 +435,11 @@ new_dentry->d_parent->d_name.name, new_d
 		 * umsdos_dirent.uid and gid sets the owner and group.
 		 * umsdos_dirent.mode set the permissions flags.
 		 */
-		dir->i_sb->u.msdos_sb.options.fs_uid = data.umsdos_dirent.uid;
-		dir->i_sb->u.msdos_sb.options.fs_gid = data.umsdos_dirent.gid;
-		dir->i_sb->u.msdos_sb.options.fs_fmask =
-			dir->i_sb->u.msdos_sb.options.fs_dmask =
+		msdossbi->options.fs_uid = data.umsdos_dirent.uid;
+		msdossbi->options.fs_gid = data.umsdos_dirent.gid;
+		msdossbi->options.fs_fmask =
+				data.umsdos_dirent.mode;
+		msdossbi->options.fs_dmask =
 				data.umsdos_dirent.mode;
 		ret = 0;
 	}

diff -Naurp linux-260-test8-efs/fs/umsdos/namei.c linux-260-test8/fs/umsdos/namei.c
@@ -16,10 +16,12 @@
 #include <linux/time.h>
 #include <linux/types.h>
 #include <linux/fcntl.h>
+#include <linux/sched.h>
 #include <linux/stat.h>
 #include <linux/string.h>
 #include <linux/msdos_fs.h>
 #include <linux/umsdos_fs.h>
+#include <linux/umsdos_fs_i.h>
 #include <linux/slab.h>
 
 #define UMSDOS_DIR_LOCK

diff -Naurp linux-260-test8-efs/fs/umsdos/rdir.c linux-260-test8/fs/umsdos/rdir.c
@@ -14,6 +14,7 @@
 #include <linux/stat.h>
 #include <linux/limits.h>
 #include <linux/umsdos_fs.h>
+#include <linux/umsdos_fs_i.h>
 #include <linux/slab.h>
 #include <linux/smp_lock.h>
 

diff -Naurp linux-260-test8-efs/fs/umsdos/dir.c linux-260-test8/fs/umsdos/dir.c
@@ -15,6 +15,7 @@
 #include <linux/stat.h>
 #include <linux/limits.h>
 #include <linux/umsdos_fs.h>
+#include <linux/umsdos_fs_i.h>
 #include <linux/slab.h>
 #include <linux/pagemap.h>
 #include <linux/smp_lock.h>

@@ -368,13 +369,16 @@ void umsdos_lookup_patch_new(struct dent
 	if (UMSDOS_I(inode)->i_patched)
 		goto out;
 	UMSDOS_I(inode)->i_patched = 1;
-	if (S_ISREG (entry->mode))
-		entry->mtime = inode->i_mtime;
+	/* TBD: fix mtime */
+	///if (S_ISREG (entry->mode))
+		///entry->mtime = inode->i_mtime;
 	inode->i_mode = entry->mode;
-	inode->i_rdev = to_kdev_t (entry->rdev);
-	inode->i_atime = entry->atime;
-	inode->i_ctime = entry->ctime;
-	inode->i_mtime = entry->mtime;
+	/* TBD: still using 16-bit dev_t; is this a problem? */
+	inode->i_rdev = old_decode_dev (entry->rdev);
+	/* TBD: fix times */
+	///inode->i_atime = entry->atime;
+	///inode->i_ctime = entry->ctime;
+	///inode->i_mtime = entry->mtime;
 	inode->i_uid = entry->uid;
 	inode->i_gid = entry->gid;
 

@@ -593,7 +597,7 @@ struct dentry *umsdos_covered(struct den
 	dentry = d_alloc(parent, &qstr);
 	if (dentry) {
 		/* XXXXXXXXXXXXXXXXXXX Race alert! */
-		result = UMSDOS_rlookup(parent->d_inode, dentry);
+		result = UMSDOS_rlookup(parent->d_inode, dentry, NULL);
 		d_drop(dentry);
 		if (result)
 			goto out_fail;

@@ -628,8 +632,8 @@ struct dentry *umsdos_lookup_dentry(stru
 		dentry = d_alloc(parent, &qstr);
 		if (dentry) {
 			result = real ?
-				UMSDOS_rlookup(parent->d_inode, dentry) :
-				UMSDOS_lookup(parent->d_inode, dentry);
+				UMSDOS_rlookup(parent->d_inode, dentry, NULL) :
+				UMSDOS_lookup(parent->d_inode, dentry, NULL);
 			if (result)
 				goto out_fail;
 			return dentry;

@@ -655,7 +659,8 @@ char * umsdos_d_path(struct dentry *dent
 	old_root = dget(current->fs->root);
 	read_unlock(&current->fs->lock);
 	spin_lock(&dcache_lock);
-	path = __d_path(dentry, current->fs->rootmnt, dentry->d_sb->s_root, current->fs->rootmnt, buffer, len); /* FIXME: current->fs->rootmnt */
+	/* FIXME: current->fs->rootmnt: */
+	path = d_path(dentry, current->fs->rootmnt, buffer, len);
 	spin_unlock(&dcache_lock);
 
 	if (*path == '/')