summaryrefslogtreecommitdiffstats
path: root/features/unionfs/unionfs-replace-d_alloc_root-with-d_make_root.patch
blob: cc32137ba75eb8205e99ccca81fae580f996de46 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
From e408aad075b70f35b882667afeb1ccc96e38df77 Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@windriver.com>
Date: Thu, 29 Mar 2012 16:09:45 -0400
Subject: [PATCH 2/5] unionfs: replace d_alloc_root with d_make_root

d_alloc_root has been removed, updating to the replacement d_make_root

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 fs/unionfs/main.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/unionfs/main.c b/fs/unionfs/main.c
index ee78f1d..0077ebe 100644
--- a/fs/unionfs/main.c
+++ b/fs/unionfs/main.c
@@ -599,7 +599,7 @@ static int unionfs_read_super(struct super_block *sb, void *raw_data,
 		err = PTR_ERR(inode);
 		goto out_dput;
 	}
-	sb->s_root = d_alloc_root(inode);
+	sb->s_root = d_make_root(inode);
 	if (unlikely(!sb->s_root)) {
 		err = -ENOMEM;
 		goto out_iput;
@@ -636,7 +636,7 @@ static int unionfs_read_super(struct super_block *sb, void *raw_data,
 
 	/*
 	 * No need to call interpose because we already have a positive
-	 * dentry, which was instantiated by d_alloc_root.  Just need to
+	 * dentry, which was instantiated by d_make_root.  Just need to
 	 * d_rehash it.
 	 */
 	d_rehash(sb->s_root);
-- 
1.7.10.4