[prev in list] [next in list] [prev in thread] [next in thread] 

List:       intermezzo-cvs
Subject:    CVS: is/fs25 inode.c,1.1,1.2 journal_ext2.c,1.1,1.2 journal_ext3.c,1.1,1.2 super.c,1.2,1.3 upcall.c,
From:       "Peter J. Braam" <braam () users ! sourceforge ! net>
Date:       2002-10-12 0:10:19
[Download RAW message or body]

Update of /cvsroot/intermezzo/is/fs25
In directory usw-pr-cvs1:/tmp/cvs-serv5628/fs25

Modified Files:
	inode.c journal_ext2.c journal_ext3.c super.c upcall.c 
Log Message:
intermezzo compiles on 2.5 -- now let's get it working...


Index: inode.c
===================================================================
RCS file: /cvsroot/intermezzo/is/fs25/inode.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -U2 -r1.1 -r1.2
--- inode.c	11 Oct 2002 22:52:01 -0000	1.1
+++ inode.c	12 Oct 2002 00:10:14 -0000	1.2
@@ -119,5 +119,5 @@
 
         ENTRY;
-        cache = presto_cache_find(sb->s_dev);
+        cache = presto_cache_find(to_kdev_t(sb->s_dev));
         if (!cache) {
                 EXIT;

Index: journal_ext2.c
===================================================================
RCS file: /cvsroot/intermezzo/is/fs25/journal_ext2.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -U2 -r1.1 -r1.2
--- journal_ext2.c	11 Oct 2002 22:52:01 -0000	1.1
+++ journal_ext2.c	12 Oct 2002 00:10:16 -0000	1.2
@@ -43,6 +43,6 @@
                                          struct super_block *sb)
 {
-        unsigned long freebl = le32_to_cpu(sb->u.ext2_sb.s_es->s_free_blocks_count);
-        unsigned long avail =   freebl - le32_to_cpu(sb->u.ext2_sb.s_es->s_r_blocks_count);
+        unsigned long freebl = le32_to_cpu(EXT2_SB(sb)->s_es->s_free_blocks_count);
+        unsigned long avail =   freebl - le32_to_cpu(EXT2_SB(sb)->s_es->s_r_blocks_count);
 	return (avail <<  EXT2_BLOCK_SIZE_BITS(sb));
 }
@@ -57,5 +57,5 @@
                 return NULL;
 
-        avail_kmlblocks = inode->i_sb->u.ext2_sb.s_es->s_free_blocks_count;
+        avail_kmlblocks = EXT2_SB(inode->i_sb)->s_es->s_free_blocks_count;
         
         if ( avail_kmlblocks < 3 ) {

Index: journal_ext3.c
===================================================================
RCS file: /cvsroot/intermezzo/is/fs25/journal_ext3.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -U2 -r1.1 -r1.2
--- journal_ext3.c	11 Oct 2002 22:52:01 -0000	1.1
+++ journal_ext3.c	12 Oct 2002 00:10:16 -0000	1.2
@@ -225,5 +225,5 @@
 {
 #ifdef EXT3_JOURNAL_DATA_FL
-        inode->u.ext3_i.i_flags |= EXT3_JOURNAL_DATA_FL;
+        EXT3_I(inode)->i_flags |= EXT3_JOURNAL_DATA_FL;
 #else
 #warning You must have a facility to enable journaled writes for recovery!

Index: super.c
===================================================================
RCS file: /cvsroot/intermezzo/is/fs25/super.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -U2 -r1.2 -r1.3
--- super.c	11 Oct 2002 23:55:44 -0000	1.2
+++ super.c	12 Oct 2002 00:10:16 -0000	1.3
@@ -191,6 +191,6 @@
 /* We always need to remove the presto options before passing 
    mount options to cache FS */
-struct super_block * presto_read_super(struct super_block * sb,
-                                       void * data, int silent)
+struct super_block * presto_get_sb(struct file_system_type *izo_type, 
+                                   int flags, char *devname, void * data)
 {
         struct file_system_type *fstype;
@@ -201,4 +201,5 @@
         char *fileset = NULL;
         char *channel = NULL;
+        struct super_block *sb;
         int err; 
         unsigned int minor;
@@ -267,5 +268,5 @@
         }
 
-        sb = fstype->read_super(sb, cache_data, silent);
+        sb = fstype->get_sb(fstype, flags, devname, data);
 
         /* this might have been freed above */
@@ -286,5 +287,5 @@
 
         /* we now know the dev of the cache: hash the cache */
-        presto_cache_add(cache, sb->s_dev);
+        presto_cache_add(cache, to_kdev_t(sb->s_dev));
         err = izo_prepare_fileset(sb->s_root, fileset); 
 
@@ -329,10 +330,22 @@
 
 
+
 #ifdef PRESTO_DEVEL
 static DECLARE_FSTYPE(presto_fs_type, "izo", presto_read_super, FS_REQUIRES_DEV);
 static DECLARE_FSTYPE(vpresto_fs_type, "vintermezzo", presto_read_super, FS_LITTER);
 #else 
-static DECLARE_FSTYPE(vpresto_fs_type, "vintermezzo", presto_read_super, FS_LITTER);
-static DECLARE_FSTYPE(presto_fs_type, "intermezzo", presto_read_super, FS_REQUIRES_DEV);
+static struct file_system_type vpresto_fs_type = {
+	.owner		= THIS_MODULE,
+	.name		= "vintermezzo",
+	.get_sb		= presto_get_sb,
+	.kill_sb	= kill_litter_super,
+};
+static struct file_system_type presto_fs_type = {
+	.owner		= THIS_MODULE,
+	.name		= "intermezzo",
+	.get_sb		= presto_get_sb,
+	.kill_sb	= kill_block_super,
+	.fs_flags	= FS_REQUIRES_DEV,
+};
 #endif
 

Index: upcall.c
===================================================================
RCS file: /cvsroot/intermezzo/is/fs25/upcall.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -U2 -r1.1 -r1.2
--- upcall.c	11 Oct 2002 22:52:01 -0000	1.1
+++ upcall.c	12 Oct 2002 00:10:16 -0000	1.2
@@ -40,5 +40,5 @@
 #include <linux/stat.h>
 #include <linux/errno.h>
-#include <linux/locks.h>
+#include <linux/smp_lock.h>
 #include <linux/string.h>
 #include <asm/uaccess.h>



-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
intermezzo-commit mailing list
intermezzo-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/intermezzo-commit
[prev in list] [next in list] [prev in thread] [next in thread]