Merge branch 'linus' into core/urgent

[linux-2.6-block.git] / include / linux / namei.h

diff --git a/include/linux/namei.h b/include/linux/namei.h
index 3439ab862e1da04d86f2a746b06e675df298b779..76fe2c62ae71b9661ea6728934fa6725dcdecd71 100644 (file)
--- a/include/linux/namei.h
+++ b/include/linux/namei.h
@@ -74,9 +74,11 @@ extern int user_path_at(int, const char __user *, unsigned, struct path *);
 
 extern int kern_path(const char *, unsigned, struct path *);
 
+extern struct dentry *kern_path_create(int, const char *, struct path *, int);
+extern struct dentry *user_path_create(int, const char __user *, struct path *, int);
 extern int kern_path_parent(const char *, struct nameidata *);
 extern int vfs_path_lookup(struct dentry *, struct vfsmount *,
-                          const char *, unsigned int, struct nameidata *);
+                          const char *, unsigned int, struct path *);
 
 extern struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry *dentry,
                int (*open)(struct inode *, struct file *));