CVS: is/fs25 vfs.c,1.1,1.2

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

Modified Files:
	vfs.c 
Log Message:
fixes for 2.5


Index: vfs.c
===================================================================
RCS file: /cvsroot/intermezzo/is/fs25/vfs.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -U2 -r1.1 -r1.2
--- vfs.c	11 Oct 2002 22:52:01 -0000	1.1
+++ vfs.c	11 Oct 2002 23:28:57 -0000	1.2
@@ -67,4 +67,5 @@
 #include <linux/file.h>
 #include <linux/fs.h>
+#include <linux/namei.h>
 #include <linux/blk.h>
 
@@ -702,7 +703,5 @@
 
         /* this looks up the parent */
-//        if (path_init(pathname, LOOKUP_FOLLOW | LOOKUP_POSITIVE, &nd))
-        if (path_init(pathname,  LOOKUP_PARENT, &nd))
-                error = path_walk(pathname, &nd);
+        error = path_lookup(pathname,  LOOKUP_PARENT, &nd);
         if (error) {
                 EXIT;
@@ -842,11 +841,7 @@
 {
         int error;
-        char * from;
         char * to;
         struct presto_file_set *fset;
 
-        from = getname(oldname);
-        if(IS_ERR(from))
-                return PTR_ERR(from);
         to = getname(newname);
         error = PTR_ERR(to);
@@ -855,11 +850,8 @@
                 struct nameidata nd, old_nd;
 
-                error = 0;
-                if (path_init(from, LOOKUP_POSITIVE, &old_nd))
-                        error = path_walk(from, &old_nd);
+                error = __user_walk(oldname, 0, &old_nd);
                 if (error)
                         goto exit;
-                if (path_init(to, LOOKUP_PARENT, &nd))
-                        error = path_walk(to, &nd);
+                error = path_lookup(to, LOOKUP_PARENT, &nd);
                 if (error)
                         goto out;
@@ -891,6 +883,4 @@
                 putname(to);
         }
-        putname(from);
-
         return error;
 }
@@ -1063,6 +1053,5 @@
                 return PTR_ERR(name);
 
-        if (path_init(name, LOOKUP_PARENT, &nd))
-                error = path_walk(name, &nd);
+        error = path_lookup(name, LOOKUP_PARENT, &nd);
         if (error)
                 goto exit;
@@ -1224,6 +1213,5 @@
         }
 
-        if (path_init(to, LOOKUP_PARENT, &nd)) 
-                error = path_walk(to, &nd);
+        error = path_lookup(to, LOOKUP_PARENT, &nd);
         if (error) {
                 EXIT;
@@ -1382,6 +1370,5 @@
         }
 
-        if (path_init(pathname, LOOKUP_PARENT, &nd))
-                error = path_walk(pathname, &nd);
+        error = path_lookup(pathname, LOOKUP_PARENT, &nd);
         if (error)
                 goto out_name;
@@ -1528,6 +1515,5 @@
         }
 
-        if (path_init(name, LOOKUP_PARENT, &nd))
-                error = path_walk(name, &nd);
+        error = path_lookup(name, LOOKUP_PARENT, &nd);
         if (error) {
                 EXIT;
@@ -1694,6 +1680,5 @@
                 return PTR_ERR(tmp);
 
-        if (path_init(tmp, LOOKUP_PARENT, &nd))
-                error = path_walk(tmp, &nd);
+        error = path_lookup(tmp, LOOKUP_PARENT, &nd);
         if (error)
                 goto out;
@@ -1974,12 +1959,9 @@
         ENTRY;
 
-        if (path_init(oldname, LOOKUP_PARENT, &oldnd))
-                error = path_walk(oldname, &oldnd);
-
+        error = path_lookup(oldname, LOOKUP_PARENT, &oldnd);
         if (error)
                 goto exit;
 
-        if (path_init(newname, LOOKUP_PARENT, &newnd))
-                error = path_walk(newname, &newnd);
+        error = path_lookup(newname, LOOKUP_PARENT, &newnd);
         if (error)
                 goto exit1;
@@ -1998,5 +1980,5 @@
                 goto exit2;
 
-        double_lock(new_dir, old_dir);
+        lock_rename(new_dir, old_dir);
 
         old_dentry = lookup_hash(&oldnd.last, old_dir);
@@ -2037,5 +2019,5 @@
         dput(old_dentry);
 exit3:
-        double_up(&new_dir->d_inode->i_sem, &old_dir->d_inode->i_sem);
+        unlock_rename(new_dir, old_dir);
 exit2:
         path_release(&newnd);
@@ -2129,5 +2111,5 @@
         f->f_dentry = dentry;
         f->f_pos = 0;
-        f->f_reada = 0;
+        //f->f_reada = 0;
         f->f_op = NULL;
         if (inode->i_op)



-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf