Embed a struct path into struct nameidata instead of nd->{dentry,mnt}

This is the central patch of a cleanup series. In most cases there is no good
reason why someone would want to use a dentry for itself. This series reflects
that fact and embeds a struct path into nameidata.

Together with the other patches of this series
- it enforced the correct order of getting/releasing the reference count on
  <dentry,vfsmount> pairs
- it prepares the VFS for stacking support since it is essential to have a
  struct path in every place where the stack can be traversed
- it reduces the overall code size:

without patch series:
   text    data     bss     dec     hex filename
5321639  858418  715768 6895825  6938d1 vmlinux

with patch series:
   text    data     bss     dec     hex filename
5320026  858418  715768 6894212  693284 vmlinux

This patch:

Switch from nd->{dentry,mnt} to nd->path.{dentry,mnt} everywhere.

[akpm@linux-foundation.org: coding-style fixes]
[akpm@linux-foundation.org: fix cifs]
[akpm@linux-foundation.org: fix smack]
Signed-off-by: Jan Blunck <jblunck@suse.de>
Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
Acked-by: Christoph Hellwig <hch@lst.de>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Casey Schaufler <casey@schaufler-ca.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 8 insertions, 8 deletions

diff --git a/kernel/audit_tree.c b/kernel/audit_tree.c
index f4fcf58f20f8..b898814fe4a0 100644
--- a/kernel/audit_tree.c
+++ b/kernel/audit_tree.c
@@ -549,7 +549,7 @@ void audit_trim_trees(void)
                 if (err)
                         goto skip_it;
 
-                root_mnt = collect_mounts(nd.mnt, nd.dentry);
+                root_mnt = collect_mounts(nd.path.mnt, nd.path.dentry);
                 path_release(&nd);
                 if (!root_mnt)
                         goto skip_it;
@@ -583,17 +583,17 @@ skip_it:
 static int is_under(struct vfsmount *mnt, struct dentry *dentry,
                     struct nameidata *nd)
 {
-        if (mnt != nd->mnt) {
+        if (mnt != nd->path.mnt) {
                 for (;;) {
                         if (mnt->mnt_parent == mnt)
                                 return 0;
-                        if (mnt->mnt_parent == nd->mnt)
+                        if (mnt->mnt_parent == nd->path.mnt)
                                         break;
                         mnt = mnt->mnt_parent;
                 }
                 dentry = mnt->mnt_mountpoint;
         }
-        return is_subdir(dentry, nd->dentry);
+        return is_subdir(dentry, nd->path.dentry);
 }
 
 int audit_make_tree(struct audit_krule *rule, char *pathname, u32 op)
@@ -641,7 +641,7 @@ int audit_add_tree_rule(struct audit_krule *rule)
         err = path_lookup(tree->pathname, 0, &nd);
         if (err)
                 goto Err;
-        mnt = collect_mounts(nd.mnt, nd.dentry);
+        mnt = collect_mounts(nd.path.mnt, nd.path.dentry);
         path_release(&nd);
         if (!mnt) {
                 err = -ENOMEM;
@@ -701,7 +701,7 @@ int audit_tag_tree(char *old, char *new)
         err = path_lookup(new, 0, &nd);
         if (err)
                 return err;
-        tagged = collect_mounts(nd.mnt, nd.dentry);
+        tagged = collect_mounts(nd.path.mnt, nd.path.dentry);
         path_release(&nd);
         if (!tagged)
                 return -ENOMEM;
@@ -711,8 +711,8 @@ int audit_tag_tree(char *old, char *new)
                 drop_collected_mounts(tagged);
                 return err;
         }
-        mnt = mntget(nd.mnt);
-        dentry = dget(nd.dentry);
+        mnt = mntget(nd.path.mnt);
+        dentry = dget(nd.path.dentry);
         path_release(&nd);
 
         if (dentry == tagged->mnt_root && dentry == mnt->mnt_root)