Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 3f50fff4dace23d3cfeb195d5cd4ee813cee68b7

Authored by J. Bruce Fields
Committed by Al Viro
1 parent 7732a557b1

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>

Showing 1 changed file with 5 additions and 8 deletions Side-by-side Diff

... ... @@ -683,8 +683,6 @@
683 683 /**
684 684 * d_find_alias - grab a hashed alias of inode
685 685 * @inode: inode in question
686   - * @want_discon: flag, used by d_splice_alias, to request
687   - * that only a DISCONNECTED alias be returned.
688 686 *
689 687 * If inode has a hashed alias, or is a directory and has any alias,
690 688 * acquire the reference to alias and return it. Otherwise return NULL.
691 689  
... ... @@ -693,10 +691,9 @@
693 691 * of a filesystem.
694 692 *
695 693 * If the inode has an IS_ROOT, DCACHE_DISCONNECTED alias, then prefer
696   - * any other hashed alias over that one unless @want_discon is set,
697   - * in which case only return an IS_ROOT, DCACHE_DISCONNECTED alias.
  694 + * any other hashed alias over that.
698 695 */
699   -static struct dentry *__d_find_alias(struct inode *inode, int want_discon)
  696 +static struct dentry *__d_find_alias(struct inode *inode)
700 697 {
701 698 struct dentry *alias, *discon_alias;
702 699  
... ... @@ -708,7 +705,7 @@
708 705 if (IS_ROOT(alias) &&
709 706 (alias->d_flags & DCACHE_DISCONNECTED)) {
710 707 discon_alias = alias;
711   - } else if (!want_discon) {
  708 + } else {
712 709 __dget_dlock(alias);
713 710 spin_unlock(&alias->d_lock);
714 711 return alias;
... ... @@ -739,7 +736,7 @@
739 736  
740 737 if (!list_empty(&inode->i_dentry)) {
741 738 spin_lock(&inode->i_lock);
742   - de = __d_find_alias(inode, 0);
  739 + de = __d_find_alias(inode);
743 740 spin_unlock(&inode->i_lock);
744 741 }
745 742 return de;
... ... @@ -2481,7 +2478,7 @@
2481 2478 struct dentry *alias;
2482 2479  
2483 2480 /* Does an aliased dentry already exist? */
2484   - alias = __d_find_alias(inode, 0);
  2481 + alias = __d_find_alias(inode);
2485 2482 if (alias) {
2486 2483 actual = alias;
2487 2484 write_seqlock(&rename_lock);