diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-01-09 14:18:33 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-01-09 14:18:33 -0500 |
| commit | 0a3a98f6dd4e8f4d928a09302c0d1c56f2192ac3 (patch) | |
| tree | 92f55e374a84d06ce8213a4540454760fdecf137 /fs/ncpfs | |
| parent | 8ef12c9f01afba47c2d33bb939085111ca0d0f7d (diff) | |
| parent | 5367f2d67c7d0bf1faae90e6e7b4e2ac3c9b5e0f (diff) | |
Merge Linus' tree.
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 a9f7a8ab1d59..cfd76f431dc0 100644 --- a/fs/ncpfs/dir.c +++ b/fs/ncpfs/dir.c | |||
| @@ -365,7 +365,7 @@ ncp_dget_fpos(struct dentry *dentry, struct dentry *parent, unsigned long fpos) | |||
| 365 | spin_lock(&dcache_lock); | 365 | spin_lock(&dcache_lock); |
| 366 | next = parent->d_subdirs.next; | 366 | next = parent->d_subdirs.next; |
| 367 | while (next != &parent->d_subdirs) { | 367 | while (next != &parent->d_subdirs) { |
| 368 | dent = list_entry(next, struct dentry, d_child); | 368 | dent = list_entry(next, struct dentry, d_u.d_child); |
| 369 | if ((unsigned long)dent->d_fsdata == fpos) { | 369 | if ((unsigned long)dent->d_fsdata == fpos) { |
| 370 | if (dent->d_inode) | 370 | if (dent->d_inode) |
| 371 | dget_locked(dent); | 371 | dget_locked(dent); |
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; |