get rid of kern_path_parent()

all callers want the same thing, actually - a kinda-sorta analog of
kern_path_create().  I.e. they want parent vfsmount/dentry (with
->i_mutex held, to make sure the child dentry is still their child)
+ the child dentry.

Signed-off-by Al Viro <viro@zeniv.linux.org.uk>

1 files changed, 3 insertions, 22 deletions

diff --git a/kernel/audit_watch.c b/kernel/audit_watch.c
index e683869365d9..3823281401b5 100644
--- a/kernel/audit_watch.c
+++ b/kernel/audit_watch.c
@@ -355,34 +355,15 @@ static void audit_remove_parent_watches(struct audit_parent *parent)
 /* Get path information necessary for adding watches. */
 static int audit_get_nd(struct audit_watch *watch, struct path *parent)
 {
-        struct nameidata nd;
-        struct dentry *d;
-        int err;
-
-        err = kern_path_parent(watch->path, &nd);
-        if (err)
-                return err;
-
-        if (nd.last_type != LAST_NORM) {
-                path_put(&nd.path);
-                return -EINVAL;
-        }
-
-        mutex_lock_nested(&nd.path.dentry->d_inode->i_mutex, I_MUTEX_PARENT);
-        d = lookup_one_len(nd.last.name, nd.path.dentry, nd.last.len);
-        if (IS_ERR(d)) {
-                mutex_unlock(&nd.path.dentry->d_inode->i_mutex);
-                path_put(&nd.path);
+        struct dentry *d = kern_path_locked(watch->path, parent);
+        if (IS_ERR(d))
                 return PTR_ERR(d);
-        }
+        mutex_unlock(&parent->dentry->d_inode->i_mutex);
         if (d->d_inode) {
                 /* update watch filter fields */
                 watch->dev = d->d_inode->i_sb->s_dev;
                 watch->ino = d->d_inode->i_ino;
         }
-        mutex_unlock(&nd.path.dentry->d_inode->i_mutex);
-
-        *parent = nd.path;
         dput(d);
         return 0;
 }