diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
| commit | a815752ac0ffdb910e92958d41d28f4fb28e5296 (patch) | |
| tree | a3aa16a282354da0debe8e3a3a7ed8aac6e54001 /fs/inode.c | |
| parent | 5ade9deaaa3e1f7291467d97b238648e43eae15e (diff) | |
| parent | a15306365a16380f3bafee9e181ba01231d4acd7 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs/inode.c')
| -rw-r--r-- | fs/inode.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/inode.c b/fs/inode.c index 27ee1af50d02..bf6478130424 100644 --- a/fs/inode.c +++ b/fs/inode.c | |||
| @@ -495,8 +495,7 @@ static struct inode * find_inode(struct super_block * sb, struct hlist_head *hea | |||
| 495 | struct inode * inode = NULL; | 495 | struct inode * inode = NULL; |
| 496 | 496 | ||
| 497 | repeat: | 497 | repeat: |
| 498 | hlist_for_each (node, head) { | 498 | hlist_for_each_entry(inode, node, head, i_hash) { |
| 499 | inode = hlist_entry(node, struct inode, i_hash); | ||
| 500 | if (inode->i_sb != sb) | 499 | if (inode->i_sb != sb) |
| 501 | continue; | 500 | continue; |
| 502 | if (!test(inode, data)) | 501 | if (!test(inode, data)) |
| @@ -520,8 +519,7 @@ static struct inode * find_inode_fast(struct super_block * sb, struct hlist_head | |||
| 520 | struct inode * inode = NULL; | 519 | struct inode * inode = NULL; |
| 521 | 520 | ||
| 522 | repeat: | 521 | repeat: |
| 523 | hlist_for_each (node, head) { | 522 | hlist_for_each_entry(inode, node, head, i_hash) { |
| 524 | inode = hlist_entry(node, struct inode, i_hash); | ||
| 525 | if (inode->i_ino != ino) | 523 | if (inode->i_ino != ino) |
| 526 | continue; | 524 | continue; |
| 527 | if (inode->i_sb != sb) | 525 | if (inode->i_sb != sb) |