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

Commit 3f50fff4 authored by J. Bruce Fields's avatar J. Bruce Fields Committed by Al Viro
Browse files

vfs: remove unused __d_splice_alias argument 



Nobody sets want_disconn any more.

Reported-by: default avatarPeng Tao <bergwolf@gmail.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 7732a557

fs/dcache.c

+5 −8
Original line number Original line Diff line number Diff line
@@ -683,8 +683,6 @@ EXPORT_SYMBOL(dget_parent); 
/**

/**

 * d_find_alias - grab a hashed alias of inode

 * d_find_alias - grab a hashed alias of inode

 * @inode: inode in question

 * @inode: inode in question

 * @want_discon:  flag, used by d_splice_alias, to request

 *          that only a DISCONNECTED alias be returned.

 *

 *

 * If inode has a hashed alias, or is a directory and has any alias,

 * If inode has a hashed alias, or is a directory and has any alias,

 * acquire the reference to alias and return it. Otherwise return NULL.

 * acquire the reference to alias and return it. Otherwise return NULL.
@@ -693,10 +691,9 @@ EXPORT_SYMBOL(dget_parent); 
 * of a filesystem.

 * of a filesystem.

 *

 *

 * If the inode has an IS_ROOT, DCACHE_DISCONNECTED alias, then prefer

 * If the inode has an IS_ROOT, DCACHE_DISCONNECTED alias, then prefer

 * any other hashed alias over that one unless @want_discon is set,

 * any other hashed alias over that.

 * in which case only return an IS_ROOT, DCACHE_DISCONNECTED alias.

 */

 */

static struct dentry *__d_find_alias(struct inode *inode, int want_discon)

static struct dentry *__d_find_alias(struct inode *inode)

{

{

	struct dentry *alias, *discon_alias;

	struct dentry *alias, *discon_alias;
@@ -708,7 +705,7 @@ again: 
			if (IS_ROOT(alias) &&

			if (IS_ROOT(alias) &&

			    (alias->d_flags & DCACHE_DISCONNECTED)) {

			    (alias->d_flags & DCACHE_DISCONNECTED)) {

				discon_alias = alias;

				discon_alias = alias;

			} else if (!want_discon) {

			} else {

				__dget_dlock(alias);

				__dget_dlock(alias);

				spin_unlock(&alias->d_lock);

				spin_unlock(&alias->d_lock);

				return alias;

				return alias;
@@ -739,7 +736,7 @@ struct dentry *d_find_alias(struct inode *inode) 




	if (!list_empty(&inode->i_dentry)) {

	if (!list_empty(&inode->i_dentry)) {

		spin_lock(&inode->i_lock);

		spin_lock(&inode->i_lock);

		de = __d_find_alias(inode, 0);

		de = __d_find_alias(inode);

		spin_unlock(&inode->i_lock);

		spin_unlock(&inode->i_lock);

	}

	}

	return de;

	return de;
@@ -2481,7 +2478,7 @@ struct dentry *d_materialise_unique(struct dentry *dentry, struct inode *inode) 
		struct dentry *alias;

		struct dentry *alias;





		/* Does an aliased dentry already exist? */

		/* Does an aliased dentry already exist? */

		alias = __d_find_alias(inode, 0);

		alias = __d_find_alias(inode);

		if (alias) {

		if (alias) {

			actual = alias;

			actual = alias;

			write_seqlock(&rename_lock);

			write_seqlock(&rename_lock);