summaryrefslogtreecommitdiff
path: root/fs/ntfs
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2012-02-12 22:04:09 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2012-03-20 21:29:35 -0400
commitea29c6950a0305f2af7fd4a2021a6e946ada0174 (patch)
tree00b58418afcfc0802a1c76ffcd09a7a189d6eae0 /fs/ntfs
parent48fde701aff662559b38d9a609574068f22d00fe (diff)
downloadlinux-3.10-ea29c6950a0305f2af7fd4a2021a6e946ada0174.tar.gz
linux-3.10-ea29c6950a0305f2af7fd4a2021a6e946ada0174.tar.bz2
linux-3.10-ea29c6950a0305f2af7fd4a2021a6e946ada0174.zip
ntfs: switch to d_make_root()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/ntfs')
-rw-r--r--fs/ntfs/super.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/ntfs/super.c b/fs/ntfs/super.c
index f907611cca7..22020d8b1ed 100644
--- a/fs/ntfs/super.c
+++ b/fs/ntfs/super.c
@@ -2908,9 +2908,10 @@ static int ntfs_fill_super(struct super_block *sb, void *opt, const int silent)
ntfs_error(sb, "Failed to load system files.");
goto unl_upcase_iput_tmp_ino_err_out_now;
}
- if ((sb->s_root = d_alloc_root(vol->root_ino))) {
- /* We grab a reference, simulating an ntfs_iget(). */
- ihold(vol->root_ino);
+
+ /* We grab a reference, simulating an ntfs_iget(). */
+ ihold(vol->root_ino);
+ if ((sb->s_root = d_make_root(vol->root_ino))) {
ntfs_debug("Exiting, status successful.");
/* Release the default upcase if it has no users. */
mutex_lock(&ntfs_lock);