Merge branch 'v28-range-hrtimers-for-linus-v2' of git://git.kernel.org/pub/scm/linux...

[linux-2.6-omap-h63xx.git] / include / linux / namei.h

diff --git a/include/linux/namei.h b/include/linux/namei.h
index 24d88e98a62648180a553fdfb457837bcbcb5c00..99eb80306dc5bba4fab74b9a1693222209d619ea 100644 (file)
--- a/include/linux/namei.h
+++ b/include/linux/namei.h
@@ -47,27 +47,28 @@ enum {LAST_NORM, LAST_ROOT, LAST_DOT, LAST_DOTDOT, LAST_BIND};
 #define LOOKUP_DIRECTORY        2
 #define LOOKUP_CONTINUE                 4
 #define LOOKUP_PARENT          16
-#define LOOKUP_NOALT           32
 #define LOOKUP_REVAL           64
 /*
  * Intent data
  */
-#define LOOKUP_OPEN            (0x0100)
-#define LOOKUP_CREATE          (0x0200)
-#define LOOKUP_ACCESS          (0x0400)
-#define LOOKUP_CHDIR           (0x0800)
-
-extern int __user_walk(const char __user *, unsigned, struct nameidata *);
-extern int __user_walk_fd(int dfd, const char __user *, unsigned, struct nameidata *);
-#define user_path_walk(name,nd) \
-       __user_walk_fd(AT_FDCWD, name, LOOKUP_FOLLOW, nd)
-#define user_path_walk_link(name,nd) \
-       __user_walk_fd(AT_FDCWD, name, 0, nd)
+#define LOOKUP_OPEN            0x0100
+#define LOOKUP_CREATE          0x0200
+#define LOOKUP_EXCL            0x0400
+#define LOOKUP_RENAME_TARGET   0x0800
+
+extern int user_path_at(int, const char __user *, unsigned, struct path *);
+
+#define user_path(name, path) user_path_at(AT_FDCWD, name, LOOKUP_FOLLOW, path)
+#define user_lpath(name, path) user_path_at(AT_FDCWD, name, 0, path)
+#define user_path_dir(name, path) \
+       user_path_at(AT_FDCWD, name, LOOKUP_FOLLOW | LOOKUP_DIRECTORY, path)
+
+extern int kern_path(const char *, unsigned, struct path *);
+
 extern int path_lookup(const char *, unsigned, struct nameidata *);
 extern int vfs_path_lookup(struct dentry *, struct vfsmount *,
                           const char *, unsigned int, struct nameidata *);
 
-extern int __user_path_lookup_open(const char __user *, unsigned lookup_flags, struct nameidata *nd, int open_flags);
 extern int path_lookup_open(int dfd, const char *name, unsigned lookup_flags, struct nameidata *, int open_flags);
 extern struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry *dentry,
                int (*open)(struct inode *, struct file *));