openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

vfs: remove unused __d_splice_alias argument 

Nobody sets want_disconn any more.

Reported-by: Peng Tao <bergwolf@gmail.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
J. Bruce Fields 2012-05-09 17:18:06 -04:00 committed by Al Viro
parent 7732a557b1
commit 3f50fff4da
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fs/dcache.c
View File

@ -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 @@ 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;
@ -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);