[PATCH] switch all filesystems over to d_obtain_alias

Switch all users of d_alloc_anon to d_obtain_alias.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

1 files changed, 6 insertions, 8 deletions

diff --git a/fs/nfs/getroot.c b/fs/nfs/getroot.c
index fae97196daad..b7c9b2df1f29 100644
--- a/fs/nfs/getroot.c
+++ b/fs/nfs/getroot.c
@@ -107,11 +107,10 @@ struct dentry *nfs_get_root(struct super_block *sb, struct nfs_fh *mntfh)
          * if the dentry tree reaches them; however if the dentry already
          * exists, we'll pick it up at this point and use it as the root
          */
-        mntroot = d_alloc_anon(inode);
-        if (!mntroot) {
-                iput(inode);
+        mntroot = d_obtain_alias(inode);
+        if (IS_ERR(mntroot)) {
                 dprintk("nfs_get_root: get root dentry failed\n");
-                return ERR_PTR(-ENOMEM);
+                return mntroot;
         }
 
         security_d_instantiate(mntroot, inode);
@@ -277,11 +276,10 @@ struct dentry *nfs4_get_root(struct super_block *sb, struct nfs_fh *mntfh)
          * if the dentry tree reaches them; however if the dentry already
          * exists, we'll pick it up at this point and use it as the root
          */
-        mntroot = d_alloc_anon(inode);
-        if (!mntroot) {
-                iput(inode);
+        mntroot = d_obtain_alias(inode);
+        if (IS_ERR(mntroot)) {
                 dprintk("nfs_get_root: get root dentry failed\n");
-                return ERR_PTR(-ENOMEM);
+                return mntroot;
         }
 
         security_d_instantiate(mntroot, inode);