diff options
Diffstat (limited to 'fs/libfs.c')
| -rw-r--r-- | fs/libfs.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/fs/libfs.c b/fs/libfs.c index fc785d8befb9..ac02ea602c3d 100644 --- a/fs/libfs.c +++ b/fs/libfs.c | |||
| @@ -149,10 +149,9 @@ int dcache_readdir(struct file * filp, void * dirent, filldir_t filldir) | |||
| 149 | /* fallthrough */ | 149 | /* fallthrough */ |
| 150 | default: | 150 | default: |
| 151 | spin_lock(&dcache_lock); | 151 | spin_lock(&dcache_lock); |
| 152 | if (filp->f_pos == 2) { | 152 | if (filp->f_pos == 2) |
| 153 | list_del(q); | 153 | list_move(q, &dentry->d_subdirs); |
| 154 | list_add(q, &dentry->d_subdirs); | 154 | |
| 155 | } | ||
| 156 | for (p=q->next; p != &dentry->d_subdirs; p=p->next) { | 155 | for (p=q->next; p != &dentry->d_subdirs; p=p->next) { |
| 157 | struct dentry *next; | 156 | struct dentry *next; |
| 158 | next = list_entry(p, struct dentry, d_u.d_child); | 157 | next = list_entry(p, struct dentry, d_u.d_child); |
| @@ -164,8 +163,7 @@ int dcache_readdir(struct file * filp, void * dirent, filldir_t filldir) | |||
| 164 | return 0; | 163 | return 0; |
| 165 | spin_lock(&dcache_lock); | 164 | spin_lock(&dcache_lock); |
| 166 | /* next is still alive */ | 165 | /* next is still alive */ |
| 167 | list_del(q); | 166 | list_move(q, p); |
| 168 | list_add(q, p); | ||
| 169 | p = q; | 167 | p = q; |
| 170 | filp->f_pos++; | 168 | filp->f_pos++; |
| 171 | } | 169 | } |