Commit 0d509c94 authored by Dan Carpenter's avatar Dan Carpenter Committed by Sage Weil
Browse files

ceph: d_obtain_alias() returns ERR_PTR() 



d_obtain_alias() doesn't return NULL, it returns an ERR_PTR().

Signed-off-by: default avatarDan Carpenter <error27@gmail.com>
Signed-off-by: default avatarSage Weil <sage@newdream.net>
parent c473ad92

fs/ceph/export.c

+6 −6
Original line number Diff line number Diff line
@@ -93,11 +93,11 @@ static struct dentry *__fh_to_dentry(struct super_block *sb, 
		return ERR_PTR(-ESTALE);



	dentry = d_obtain_alias(inode);

	if (!dentry) {

	if (IS_ERR(dentry)) {

		pr_err("fh_to_dentry %llx -- inode %p but ENOMEM\n",

		       fh->ino, inode);

		iput(inode);

		return ERR_PTR(-ENOMEM);

		return dentry;

	}

	err = ceph_init_dentry(dentry);
@@ -149,11 +149,11 @@ static struct dentry *__cfh_to_dentry(struct super_block *sb, 
	}



	dentry = d_obtain_alias(inode);

	if (!dentry) {

	if (IS_ERR(dentry)) {

		pr_err("cfh_to_dentry %llx -- inode %p but ENOMEM\n",

		       cfh->ino, inode);

		iput(inode);

		return ERR_PTR(-ENOMEM);

		return dentry;

	}

	err = ceph_init_dentry(dentry);

	if (err < 0) {
@@ -202,11 +202,11 @@ static struct dentry *ceph_fh_to_parent(struct super_block *sb, 
		return ERR_PTR(-ESTALE);



	dentry = d_obtain_alias(inode);

	if (!dentry) {

	if (IS_ERR(dentry)) {

		pr_err("fh_to_parent %llx -- inode %p but ENOMEM\n",

		       cfh->ino, inode);

		iput(inode);

		return ERR_PTR(-ENOMEM);

		return dentry;

	}

	err = ceph_init_dentry(dentry);

	if (err < 0) {