diff options
| author | Gary S. Robertson <gary.robertson@linaro.org> | 2015-06-15 07:32:39 -0500 |
|---|---|---|
| committer | Gary S. Robertson <gary.robertson@linaro.org> | 2015-06-15 07:32:39 -0500 |
| commit | b57ffdabee89d9af03d470803acf5f220722963f (patch) | |
| tree | 14eb53a4449f8950733c4fe8c33882cef6d9a454 /fs/notify | |
| parent | 6cf74712ced25affec76636c39d4d625b82b218a (diff) | |
| parent | 0c94ab754b26e23ecdd6ddb1607c7a3e3f0f27fc (diff) | |
Merge tag 'lsk-v3.14-15.05' into linux-linaro-lng-v3.14
LSK 15.05 v3.14
Diffstat (limited to 'fs/notify')
| -rw-r--r-- | fs/notify/fsnotify.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/notify/fsnotify.c b/fs/notify/fsnotify.c index 9d3e9c50066a..700129940c6e 100644 --- a/fs/notify/fsnotify.c +++ b/fs/notify/fsnotify.c @@ -63,14 +63,14 @@ void __fsnotify_update_child_dentry_flags(struct inode *inode) spin_lock(&inode->i_lock); /* run all of the dentries associated with this inode. Since this is a * directory, there damn well better only be one item on this list */ - hlist_for_each_entry(alias, &inode->i_dentry, d_alias) { + hlist_for_each_entry(alias, &inode->i_dentry, d_u.d_alias) { struct dentry *child; /* run all of the children of the original inode and fix their * d_flags to indicate parental interest (their parent is the * original inode) */ spin_lock(&alias->d_lock); - list_for_each_entry(child, &alias->d_subdirs, d_u.d_child) { + list_for_each_entry(child, &alias->d_subdirs, d_child) { if (!child->d_inode) continue; |