mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
synced 2025-01-06 05:02:31 +00:00
dcache: remove unused d_find_alias parameter
Signed-off-by: J. Bruce Fields <bfields@redhat.com> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
parent
1a0a397e41
commit
52ed46f0fa
13
fs/dcache.c
13
fs/dcache.c
@ -731,8 +731,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.
|
||||||
@ -741,10 +739,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 one.
|
||||||
* 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;
|
||||||
|
|
||||||
@ -756,7 +753,7 @@ static struct dentry *__d_find_alias(struct inode *inode, int want_discon)
|
|||||||
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;
|
||||||
@ -787,7 +784,7 @@ struct dentry *d_find_alias(struct inode *inode)
|
|||||||
|
|
||||||
if (!hlist_empty(&inode->i_dentry)) {
|
if (!hlist_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;
|
||||||
@ -2765,7 +2762,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);
|
||||||
|
Loading…
Reference in New Issue
Block a user