diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2006-01-17 10:26:28 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2006-01-17 10:26:28 -0500 |
commit | 0825788ff27c7145e9d558cb2a26f3837d1f9be5 (patch) | |
tree | f6bdb892cec8ca0df69c08a3477c89f1542999e5 /fs/ncpfs/ncplib_kernel.h | |
parent | 02f693c7118f6be9e677070eb630c1f3a654cdd3 (diff) | |
parent | 1bc4ccfff8675adc3d96f91245eb7e2dc0043ca9 (diff) |
Merge branch 'upstream'
Diffstat (limited to 'fs/ncpfs/ncplib_kernel.h')
-rw-r--r-- | fs/ncpfs/ncplib_kernel.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ncpfs/ncplib_kernel.h b/fs/ncpfs/ncplib_kernel.h index 9e4dc30c2435..799e5c2bec55 100644 --- a/fs/ncpfs/ncplib_kernel.h +++ b/fs/ncpfs/ncplib_kernel.h | |||
@@ -196,7 +196,7 @@ ncp_renew_dentries(struct dentry *parent) | |||
196 | spin_lock(&dcache_lock); | 196 | spin_lock(&dcache_lock); |
197 | next = parent->d_subdirs.next; | 197 | next = parent->d_subdirs.next; |
198 | while (next != &parent->d_subdirs) { | 198 | while (next != &parent->d_subdirs) { |
199 | dentry = list_entry(next, struct dentry, d_child); | 199 | dentry = list_entry(next, struct dentry, d_u.d_child); |
200 | 200 | ||
201 | if (dentry->d_fsdata == NULL) | 201 | if (dentry->d_fsdata == NULL) |
202 | ncp_age_dentry(server, dentry); | 202 | ncp_age_dentry(server, dentry); |
@@ -218,7 +218,7 @@ ncp_invalidate_dircache_entries(struct dentry *parent) | |||
218 | spin_lock(&dcache_lock); | 218 | spin_lock(&dcache_lock); |
219 | next = parent->d_subdirs.next; | 219 | next = parent->d_subdirs.next; |
220 | while (next != &parent->d_subdirs) { | 220 | while (next != &parent->d_subdirs) { |
221 | dentry = list_entry(next, struct dentry, d_child); | 221 | dentry = list_entry(next, struct dentry, d_u.d_child); |
222 | dentry->d_fsdata = NULL; | 222 | dentry->d_fsdata = NULL; |
223 | ncp_age_dentry(server, dentry); | 223 | ncp_age_dentry(server, dentry); |
224 | next = next->next; | 224 | next = next->next; |