diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2014-10-26 19:19:16 -0400 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2015-01-01 01:27:50 +0000 |
| commit | 026181647a6262f4ba6d60c0847d306ad685468c (patch) | |
| tree | 6254d3a8adc41c4d18c455067d3e8962c0e1b48a /drivers/usb/core | |
| parent | 060d11323f35afb752a7ba6c5bead732c204de55 (diff) | |
| download | kernel_samsung_smdk4412-026181647a6262f4ba6d60c0847d306ad685468c.zip kernel_samsung_smdk4412-026181647a6262f4ba6d60c0847d306ad685468c.tar.gz kernel_samsung_smdk4412-026181647a6262f4ba6d60c0847d306ad685468c.tar.bz2 | |
move d_rcu from overlapping d_child to overlapping d_alias
commit 946e51f2bf37f1656916eb75bd0742ba33983c28 upstream.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
[bwh: Backported to 3.2:
- Apply name changes in all the different places we use d_alias and d_child
- Move the WARN_ON() in __d_free() to d_free() as we don't have dentry_free()]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/usb/core')
| -rw-r--r-- | drivers/usb/core/inode.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/core/inode.c b/drivers/usb/core/inode.c index 2278dad..5babd94 100644 --- a/drivers/usb/core/inode.c +++ b/drivers/usb/core/inode.c @@ -212,7 +212,7 @@ static void update_bus(struct dentry *bus) mutex_lock(&bus->d_inode->i_mutex); - list_for_each_entry(dev, &bus->d_subdirs, d_u.d_child) + list_for_each_entry(dev, &bus->d_subdirs, d_child) if (dev->d_inode) update_dev(dev); @@ -229,7 +229,7 @@ static void update_sb(struct super_block *sb) mutex_lock_nested(&root->d_inode->i_mutex, I_MUTEX_PARENT); - list_for_each_entry(bus, &root->d_subdirs, d_u.d_child) { + list_for_each_entry(bus, &root->d_subdirs, d_child) { if (bus->d_inode) { switch (S_IFMT & bus->d_inode->i_mode) { case S_IFDIR: @@ -345,7 +345,7 @@ static int usbfs_empty (struct dentry *dentry) spin_lock(&dentry->d_lock); list_for_each(list, &dentry->d_subdirs) { - struct dentry *de = list_entry(list, struct dentry, d_u.d_child); + struct dentry *de = list_entry(list, struct dentry, d_child); spin_lock_nested(&de->d_lock, DENTRY_D_LOCK_NESTED); if (usbfs_positive(de)) { |