Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 07a8e62f authored by Al Viro's avatar Al Viro
Browse files

drbd: ->d_parent is never NULL or negative 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 2853908a

drivers/block/drbd/drbd_debugfs.c

+0 −4
Original line number Diff line number Diff line
@@ -430,9 +430,6 @@ static int drbd_single_open(struct file *file, int (*show)(struct seq_file *, vo 
	/* Are we still linked,

	 * or has debugfs_remove() already been called? */

	parent = file->f_path.dentry->d_parent;

	/* not sure if this can happen: */

	if (!parent || d_really_is_negative(parent))

		goto out;

	/* serialize with d_delete() */

	inode_lock(d_inode(parent));

	/* Make sure the object is still alive */
@@ -445,7 +442,6 @@ static int drbd_single_open(struct file *file, int (*show)(struct seq_file *, vo 
		if (ret)

			kref_put(kref, release);

	}

out:

	return ret;

}

security/inode.c

+0 −4
Original line number Diff line number Diff line
@@ -191,10 +191,6 @@ void securityfs_remove(struct dentry *dentry) 
	if (!dentry || IS_ERR(dentry))

		return;



	parent = dentry->d_parent;

	if (!parent || d_really_is_negative(parent))

		return;



	inode_lock(d_inode(parent));

	if (simple_positive(dentry)) {

		if (d_is_dir(dentry))