diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2014-10-26 19:19:16 -0400 |
|---|---|---|
| committer | Zefan Li <lizefan@huawei.com> | 2015-04-14 17:33:58 +0800 |
| commit | 6fd17def6d964c81205230e02b4208c653106d51 (patch) | |
| tree | 1253f07591fe80dc3442db927536c1b3f66b5cd7 /drivers | |
| parent | a42e15a485c14f6d994192af4c16775fbd6c1126 (diff) | |
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>
[lizf: Backported to 3.4:
- adjust context
- need one more name change in debugfs]
Diffstat (limited to 'drivers')
| -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 d2b9af59cba9..b283a652f155 100644 --- a/drivers/usb/core/inode.c +++ b/drivers/usb/core/inode.c @@ -211,7 +211,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); @@ -228,7 +228,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: @@ -342,7 +342,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)) { |