diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2014-10-26 19:19:16 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2014-11-03 15:20:29 -0500 |
commit | 946e51f2bf37f1656916eb75bd0742ba33983c28 (patch) | |
tree | e3d2672edeec1117ceda1e8e195eaa8d1c0f5135 /fs/ncpfs | |
parent | a7400222e3eb7d5ce3820d2234905bbeafabd171 (diff) |
move d_rcu from overlapping d_child to overlapping d_alias
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/ncpfs')
-rw-r--r-- | fs/ncpfs/dir.c | 2 | ||||
-rw-r--r-- | fs/ncpfs/ncplib_kernel.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/fs/ncpfs/dir.c b/fs/ncpfs/dir.c index 461f6be5df20..865d578704c8 100644 --- a/fs/ncpfs/dir.c +++ b/fs/ncpfs/dir.c | |||
@@ -403,7 +403,7 @@ ncp_dget_fpos(struct dentry *dentry, struct dentry *parent, unsigned long fpos) | |||
403 | 403 | ||
404 | /* If a pointer is invalid, we search the dentry. */ | 404 | /* If a pointer is invalid, we search the dentry. */ |
405 | spin_lock(&parent->d_lock); | 405 | spin_lock(&parent->d_lock); |
406 | list_for_each_entry(dent, &parent->d_subdirs, d_u.d_child) { | 406 | list_for_each_entry(dent, &parent->d_subdirs, d_child) { |
407 | if ((unsigned long)dent->d_fsdata == fpos) { | 407 | if ((unsigned long)dent->d_fsdata == fpos) { |
408 | if (dent->d_inode) | 408 | if (dent->d_inode) |
409 | dget(dent); | 409 | dget(dent); |
diff --git a/fs/ncpfs/ncplib_kernel.h b/fs/ncpfs/ncplib_kernel.h index 52cb19d66ecb..b785f74bfe3c 100644 --- a/fs/ncpfs/ncplib_kernel.h +++ b/fs/ncpfs/ncplib_kernel.h | |||
@@ -191,7 +191,7 @@ ncp_renew_dentries(struct dentry *parent) | |||
191 | struct dentry *dentry; | 191 | struct dentry *dentry; |
192 | 192 | ||
193 | spin_lock(&parent->d_lock); | 193 | spin_lock(&parent->d_lock); |
194 | list_for_each_entry(dentry, &parent->d_subdirs, d_u.d_child) { | 194 | list_for_each_entry(dentry, &parent->d_subdirs, d_child) { |
195 | if (dentry->d_fsdata == NULL) | 195 | if (dentry->d_fsdata == NULL) |
196 | ncp_age_dentry(server, dentry); | 196 | ncp_age_dentry(server, dentry); |
197 | else | 197 | else |
@@ -207,7 +207,7 @@ ncp_invalidate_dircache_entries(struct dentry *parent) | |||
207 | struct dentry *dentry; | 207 | struct dentry *dentry; |
208 | 208 | ||
209 | spin_lock(&parent->d_lock); | 209 | spin_lock(&parent->d_lock); |
210 | list_for_each_entry(dentry, &parent->d_subdirs, d_u.d_child) { | 210 | list_for_each_entry(dentry, &parent->d_subdirs, d_child) { |
211 | dentry->d_fsdata = NULL; | 211 | dentry->d_fsdata = NULL; |
212 | ncp_age_dentry(server, dentry); | 212 | ncp_age_dentry(server, dentry); |
213 | } | 213 | } |