From f56026cbec483cbff65a211759ba249cbfca967f Mon Sep 17 00:00:00 2001
From: David Howells <dhowells@redhat.com>
Date: Sun, 30 Jul 2006 14:58:27 -0400
Subject: [PATCH] --- yaml --- r: 34769 b: refs/heads/master c:
 738a35195941ecf604d3070e2a053e1df3de350b h: refs/heads/master i:   34767:
 546ef8d4ecce41f3ebdaf31a22e215126eab0205 v: v3

---
 [refs]                 | 2 +-
 trunk/fs/nfs/getroot.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 6eebe87a229f..6454120a7e34 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 27ba851244f627a302d0fc6469d1ad413fc34fcb
+refs/heads/master: 738a35195941ecf604d3070e2a053e1df3de350b
diff --git a/trunk/fs/nfs/getroot.c b/trunk/fs/nfs/getroot.c
index 977e59088eeb..76b08ae9ed82 100644
--- a/trunk/fs/nfs/getroot.c
+++ b/trunk/fs/nfs/getroot.c
@@ -33,6 +33,7 @@
 #include <linux/vfs.h>
 #include <linux/namei.h>
 #include <linux/namespace.h>
+#include <linux/security.h>
 
 #include <asm/system.h>
 #include <asm/uaccess.h>
@@ -109,6 +110,8 @@ struct dentry *nfs_get_root(struct super_block *sb, struct nfs_fh *mntfh)
 		return ERR_PTR(-ENOMEM);
 	}
 
+	security_d_instantiate(mntroot, inode);
+
 	if (!mntroot->d_op)
 		mntroot->d_op = server->nfs_client->rpc_ops->dentry_ops;
 
@@ -296,6 +299,8 @@ struct dentry *nfs4_get_root(struct super_block *sb, struct nfs_fh *mntfh)
 		return ERR_PTR(-ENOMEM);
 	}
 
+	security_d_instantiate(mntroot, inode);
+
 	if (!mntroot->d_op)
 		mntroot->d_op = server->nfs_client->rpc_ops->dentry_ops;