This commit was manufactured by cvs2svn to create tag

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

diff --git a/include/linux/namei.h b/include/linux/namei.h
index 1bbfa29..3d51a4a 100644 (file)
--- a/include/linux/namei.h
+++ b/include/linux/namei.h
@@ -18,7 +18,6 @@ struct nameidata {
        struct qstr     last;
        unsigned int    flags;
        int             last_type;
-       unsigned        depth;
        char *saved_names[MAX_NESTED_LINKS + 1];
 
        /* Intent data */
@@ -45,6 +44,8 @@ enum {LAST_NORM, LAST_ROOT, LAST_DOT, LAST_DOTDOT, LAST_BIND};
 #define LOOKUP_CONTINUE                 4
 #define LOOKUP_PARENT          16
 #define LOOKUP_NOALT           32
+#define LOOKUP_ATOMIC          64
+
 /*
  * Intent data
  */
@@ -61,7 +62,6 @@ extern int FASTCALL(path_lookup(const char *, unsigned, struct nameidata *));
 extern int FASTCALL(path_walk(const char *, struct nameidata *));
 extern int FASTCALL(link_path_walk(const char *, struct nameidata *));
 extern void path_release(struct nameidata *);
-extern void path_release_on_umount(struct nameidata *);
 
 extern struct dentry * lookup_one_len(const char *, struct dentry *, int);
 extern struct dentry * lookup_hash(struct qstr *, struct dentry *);
@@ -72,14 +72,4 @@ extern int follow_up(struct vfsmount **, struct dentry **);
 extern struct dentry *lock_rename(struct dentry *, struct dentry *);
 extern void unlock_rename(struct dentry *, struct dentry *);
 
-static inline void nd_set_link(struct nameidata *nd, char *path)
-{
-       nd->saved_names[nd->depth] = path;
-}
-
-static inline char *nd_get_link(struct nameidata *nd)
-{
-       return nd->saved_names[nd->depth];
-}
-
 #endif /* _LINUX_NAMEI_H */