lkml.org 
[lkml]   [2012]   [May]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 4/5] overlayfs: switch from d_alloc_root() to d_make_root()
Date
d_alloc_root() has been deprecated (and removed) in favour of
d_make_root(). Follow this new interface.

Signed-off-by: Andy Whitcroft <apw@canonical.com>
---
fs/overlayfs/super.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c
index b679019..24bdcc5 100644
--- a/fs/overlayfs/super.c
+++ b/fs/overlayfs/super.c
@@ -538,13 +538,9 @@ static int ovl_fill_super(struct super_block *sb, void *data, int silent)
if (oe == NULL)
goto out_free_config;

- root_inode = ovl_new_inode(sb, S_IFDIR, oe);
- if (!root_inode)
- goto out_free_oe;
-
err = kern_path(ufs->config.upperdir, LOOKUP_FOLLOW, &upperpath);
if (err)
- goto out_put_root;
+ goto out_free_oe;

err = kern_path(ufs->config.lowerdir, LOOKUP_FOLLOW, &lowerpath);
if (err)
@@ -596,7 +592,11 @@ static int ovl_fill_super(struct super_block *sb, void *data, int silent)
}

err = -ENOMEM;
- root_dentry = d_alloc_root(root_inode);
+ root_inode = ovl_new_inode(sb, S_IFDIR, oe);
+ if (!root_inode)
+ goto out_drop_write;
+
+ root_dentry = d_make_root(root_inode);
if (!root_dentry)
goto out_drop_write;

@@ -626,8 +626,6 @@ out_put_lowerpath:
path_put(&lowerpath);
out_put_upperpath:
path_put(&upperpath);
-out_put_root:
- iput(root_inode);
out_free_oe:
kfree(oe);
out_free_config:
--
1.7.9.5


\
 
 \ /
  Last update: 2012-05-01 17:41    [from the cache]
©2003-2014 Jasper Spaans. Advertise on this site