diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2014-09-25 23:57:58 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2014-10-09 02:39:16 -0400 |
commit | 821cc3070ff54e39ab6624c843f1905d737d9ac0 (patch) | |
tree | b931db75f0713ca95fa78443f4f6ddd6cd7ec975 /fs/ncpfs/dir.c | |
parent | 5e6123f3477e4260fb14392f0a88f1a842fa4d42 (diff) |
ncpfs: use list_for_each_entry() for d_subdirs walk
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/ncpfs/dir.c')
-rw-r--r-- | fs/ncpfs/dir.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/fs/ncpfs/dir.c b/fs/ncpfs/dir.c index 08b8ea8c353e..314e7add99b8 100644 --- a/fs/ncpfs/dir.c +++ b/fs/ncpfs/dir.c | |||
@@ -388,7 +388,6 @@ static struct dentry * | |||
388 | ncp_dget_fpos(struct dentry *dentry, struct dentry *parent, unsigned long fpos) | 388 | ncp_dget_fpos(struct dentry *dentry, struct dentry *parent, unsigned long fpos) |
389 | { | 389 | { |
390 | struct dentry *dent = dentry; | 390 | struct dentry *dent = dentry; |
391 | struct list_head *next; | ||
392 | 391 | ||
393 | if (d_validate(dent, parent)) { | 392 | if (d_validate(dent, parent)) { |
394 | if (dent->d_name.len <= NCP_MAXPATHLEN && | 393 | if (dent->d_name.len <= NCP_MAXPATHLEN && |
@@ -404,9 +403,7 @@ ncp_dget_fpos(struct dentry *dentry, struct dentry *parent, unsigned long fpos) | |||
404 | 403 | ||
405 | /* If a pointer is invalid, we search the dentry. */ | 404 | /* If a pointer is invalid, we search the dentry. */ |
406 | spin_lock(&parent->d_lock); | 405 | spin_lock(&parent->d_lock); |
407 | next = parent->d_subdirs.next; | 406 | list_for_each_entry(dent, &parent->d_subdirs, d_u.d_child) { |
408 | while (next != &parent->d_subdirs) { | ||
409 | dent = list_entry(next, struct dentry, d_u.d_child); | ||
410 | if ((unsigned long)dent->d_fsdata == fpos) { | 407 | if ((unsigned long)dent->d_fsdata == fpos) { |
411 | if (dent->d_inode) | 408 | if (dent->d_inode) |
412 | dget(dent); | 409 | dget(dent); |
@@ -415,7 +412,6 @@ ncp_dget_fpos(struct dentry *dentry, struct dentry *parent, unsigned long fpos) | |||
415 | spin_unlock(&parent->d_lock); | 412 | spin_unlock(&parent->d_lock); |
416 | goto out; | 413 | goto out; |
417 | } | 414 | } |
418 | next = next->next; | ||
419 | } | 415 | } |
420 | spin_unlock(&parent->d_lock); | 416 | spin_unlock(&parent->d_lock); |
421 | return NULL; | 417 | return NULL; |