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

List:       intermezzo-cvs
Subject:    CVS: intermezzo/presto24 fileset.c,1.16,1.17 journal.c,1.59,1.60 super.c,1.40,1.41
From:       Robert Read <rread () users ! sourceforge ! net>
Date:       2002-10-03 3:50:51
[Download RAW message or body]

Update of /cvsroot/intermezzo/intermezzo/presto24
In directory usw-pr-cvs1:/tmp/cvs-serv9564/fs24

Modified Files:
	fileset.c journal.c super.c 
Log Message:
* fix old lml offset bug
* remove some old debug messages


Index: fileset.c
===================================================================
RCS file: /cvsroot/intermezzo/intermezzo/presto24/fileset.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -U2 -r1.16 -r1.17
--- fileset.c	3 May 2002 07:40:29 -0000	1.16
+++ fileset.c	3 Oct 2002 03:50:49 -0000	1.17
@@ -232,5 +232,5 @@
         CDEBUG(D_INODE, "fset at %p\n", fset);
 
-        CERROR("InterMezzo: fsetroot: inode %ld, fileset name %s\n",
+        CDEBUG(D_INODE, "InterMezzo: fsetroot: inode %ld, fileset name %s\n",
                dentry->d_inode->i_ino, fsetname);
 

Index: journal.c
===================================================================
RCS file: /cvsroot/intermezzo/intermezzo/presto24/journal.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -U2 -r1.59 -r1.60
--- journal.c	27 Sep 2002 00:43:16 -0000	1.59
+++ journal.c	3 Oct 2002 03:50:49 -0000	1.60
@@ -1023,5 +1023,5 @@
         if (zeroes <= 0) return 0;
                        
-        zeroes -= sizeof(suffix);
+        zeroes -= sizeof(suffix) + sizeof(int);
         rc = presto_fread(fd->fd_file, (char *)&suffix, sizeof(suffix), &zeroes);
         if ( rc != sizeof(suffix) ) {

Index: super.c
===================================================================
RCS file: /cvsroot/intermezzo/intermezzo/presto24/super.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -U2 -r1.40 -r1.41
--- super.c	27 Sep 2002 00:43:16 -0000	1.40
+++ super.c	3 Oct 2002 03:50:49 -0000	1.41
@@ -242,5 +242,5 @@
         }
 
-        CERROR("Presto: type=%s, fset=%s, dev= %d, flags %x\n",
+        CDEBUG(D_SUPER, "Presto: type=%s, fset=%s, dev= %d, flags %x\n",
                cache_type, fileset?fileset:"NULL", minor, cache->cache_flags);
 
@@ -250,5 +250,4 @@
         fstype = get_fs_type(cache_type);
         cache->cache_filter = filter_get_filter_fs((const char *)cache_type); 
-        CERROR("\n");
         if ( !fstype || !cache->cache_filter) {
                 CERROR("Presto: unrecognized fs type or cache type\n");
@@ -258,5 +257,4 @@
         }
 
-        CERROR("\n");
         /* can we in fact mount the cache */ 
         if ((fstype->fs_flags & FS_REQUIRES_DEV) && !sb->s_bdev) {
@@ -268,7 +266,5 @@
         }
 
-        CERROR("\n");
         sb = fstype->read_super(sb, cache_data, silent);
-        CERROR("\n");
 
         /* this might have been freed above */
@@ -286,42 +282,26 @@
 
         cache->cache_sb = sb;
-        CERROR("\n");
         cache->cache_root = dget(sb->s_root);
-        CERROR("\n");
 
         /* we now know the dev of the cache: hash the cache */
-        CERROR("\n");
         presto_cache_add(cache, sb->s_dev);
-        CERROR("\n");
         err = izo_prepare_fileset(sb->s_root, fileset); 
-        CERROR("\n");
 
-        CERROR("\n");
         filter_setup_journal_ops(cache->cache_filter, cache->cache_type); 
-        CERROR("\n");
 
         /* make sure we have our own super operations: sb
            still contains the cache operations */
-        CERROR("\n");
         filter_setup_super_ops(cache->cache_filter, sb->s_op, 
                                &presto_super_ops);
-        CERROR("\n");
         sb->s_op = filter_c2usops(cache->cache_filter);
-        CERROR("\n");
 
         /* get izo directory operations: sb->s_root->d_inode exists now */
-        CERROR("\n");
         filter_setup_dir_ops(cache->cache_filter, sb->s_root->d_inode,
                              &presto_dir_iops, &presto_dir_fops);
-        CERROR("\n");
         filter_setup_dentry_ops(cache->cache_filter, sb->s_root->d_op, 
                                 &presto_dentry_ops);
-        CERROR("\n");
         sb->s_root->d_inode->i_op = filter_c2udiops(cache->cache_filter);
-        CERROR("\n");
         sb->s_root->d_inode->i_fop = filter_c2udfops(cache->cache_filter);
-        CERROR("\n");
         sb->s_root->d_op = filter_c2udops(cache->cache_filter);
-        CERROR("\n");
 
         EXIT;



-------------------------------------------------------
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]