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

List:       intermezzo-cvs
Subject:    CVS: is/fs25 fileset.c,1.1,1.2 journal.c,1.1,1.2 presto.c,1.1,1.2
From:       "Peter J. Braam" <braam () users ! sourceforge ! net>
Date:       2002-10-11 23:39:03
[Download RAW message or body]

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

Modified Files:
	fileset.c journal.c presto.c 
Log Message:
fixes for 2.5


Index: fileset.c
===================================================================
RCS file: /cvsroot/intermezzo/is/fs25/fileset.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -U2 -r1.1 -r1.2
--- fileset.c	11 Oct 2002 22:52:01 -0000	1.1
+++ fileset.c	11 Oct 2002 23:39:01 -0000	1.2
@@ -32,4 +32,5 @@
 #include <linux/errno.h>
 #include <linux/fs.h>
+#include <linux/namei.h>
 #include <linux/ext2_fs.h>
 #include <linux/slab.h>

Index: journal.c
===================================================================
RCS file: /cvsroot/intermezzo/is/fs25/journal.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -U2 -r1.1 -r1.2
--- journal.c	11 Oct 2002 22:52:01 -0000	1.1
+++ journal.c	11 Oct 2002 23:39:01 -0000	1.2
@@ -29,4 +29,5 @@
 #include <linux/sched.h>
 #include <linux/fs.h>
+#include <linux/namei.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
@@ -618,6 +619,5 @@
         CDEBUG(D_CACHE, "looking up: %s\n", path);
 
-        if (path_init(path, LOOKUP_PARENT, nd))
-                error = path_walk(path, nd);
+        error = path_lookup(path, LOOKUP_PARENT, nd);
         if (error) {
                 EXIT;
@@ -663,5 +663,5 @@
         }
 
-        double_lock(newnd.dentry, oldnd.dentry);
+        lock_rename(newnd.dentry, oldnd.dentry);
         old_dentry = lookup_hash(&oldnd.last, oldnd.dentry);
         error = PTR_ERR(old_dentry);
@@ -694,5 +694,5 @@
         dput(old_dentry);
  exit3:
-        double_up(&newnd.dentry->d_inode->i_sem, &oldnd.dentry->d_inode->i_sem);
+        unlock_rename(newnd.dentry, oldnd.dentry);
         path_release(&newnd);
  exit2:

Index: presto.c
===================================================================
RCS file: /cvsroot/intermezzo/is/fs25/presto.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -U2 -r1.1 -r1.2
--- presto.c	11 Oct 2002 22:52:01 -0000	1.1
+++ presto.c	11 Oct 2002 23:39:01 -0000	1.2
@@ -27,4 +27,5 @@
 #include <linux/sched.h>
 #include <linux/fs.h>
+#include <linux/namei.h>
 #include <linux/stat.h>
 #include <linux/errno.h>
@@ -50,10 +51,8 @@
            XXX: This code implies that direct symlinks do not work. SHP
         */
-        unsigned int flags = LOOKUP_POSITIVE;
+        unsigned int flags = 0; //LOOKUP_POSITIVE;
 
         ENTRY;
-        err = 0;
-        if (path_init(name, flags, nd)) 
-                err = path_walk(name, nd);
+        err = path_lookup(name, flags, nd);
         return err;
 }



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