Merge branch 'd_real' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs into work.misc

1 files changed, 3 insertions, 2 deletions

diff --git a/Documentation/filesystems/Locking b/Documentation/filesystems/Locking
index 08086dc160d3..a38da93865c2 100644
--- a/Documentation/filesystems/Locking
+++ b/Documentation/filesystems/Locking
@@ -20,6 +20,8 @@ prototypes:
         char *(*d_dname)((struct dentry *dentry, char *buffer, int buflen);
         struct vfsmount *(*d_automount)(struct path *path);
         int (*d_manage)(struct dentry *, bool);
+        struct dentry *(*d_real)(struct dentry *, const struct inode *,
+                                 unsigned int);
 
 locking rules:
                 rename_lock     ->d_lock        may block       rcu-walk
@@ -34,6 +36,7 @@ d_iput:		no		no		yes		no
 d_dname:        no              no              no              no
 d_automount:    no              no              yes             no
 d_manage:       no              no              yes (ref-walk)  maybe
+d_real          no              no              yes             no
 
 --------------------------- inode_operations --------------------------- 
 prototypes:
@@ -66,7 +69,6 @@ prototypes:
                                 struct file *, unsigned open_flag,
                                 umode_t create_mode, int *opened);
         int (*tmpfile) (struct inode *, struct dentry *, umode_t);
-        int (*dentry_open)(struct dentry *, struct file *, const struct cred *);
 
 locking rules:
         all may block
@@ -95,7 +97,6 @@ fiemap:		no
 update_time:    no
 atomic_open:    yes
 tmpfile:        no
-dentry_open:    no
 
         Additionally, ->rmdir(), ->unlink() and ->rename() have ->i_mutex on
 victim.