diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2012-06-09 13:51:19 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-07-14 08:32:55 -0400 |
commit | b3d9b7a3c752dc4b6976a4ff7b8298887a5b734d (patch) | |
tree | ce0d4c84328890dd63c9c4cb3e281b6b3476f85f /fs/cifs/inode.c | |
parent | 9f713878f22e0b2d34d62df0ca55f65166375634 (diff) |
vfs: switch i_dentry/d_alias to hlist
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/cifs/inode.c')
-rw-r--r-- | fs/cifs/inode.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c index 745da3d0653e..8e8bb49112ff 100644 --- a/fs/cifs/inode.c +++ b/fs/cifs/inode.c | |||
@@ -800,7 +800,7 @@ cifs_find_inode(struct inode *inode, void *opaque) | |||
800 | return 0; | 800 | return 0; |
801 | 801 | ||
802 | /* if it's not a directory or has no dentries, then flag it */ | 802 | /* if it's not a directory or has no dentries, then flag it */ |
803 | if (S_ISDIR(inode->i_mode) && !list_empty(&inode->i_dentry)) | 803 | if (S_ISDIR(inode->i_mode) && !hlist_empty(&inode->i_dentry)) |
804 | fattr->cf_flags |= CIFS_FATTR_INO_COLLISION; | 804 | fattr->cf_flags |= CIFS_FATTR_INO_COLLISION; |
805 | 805 | ||
806 | return 1; | 806 | return 1; |
@@ -825,9 +825,10 @@ static bool | |||
825 | inode_has_hashed_dentries(struct inode *inode) | 825 | inode_has_hashed_dentries(struct inode *inode) |
826 | { | 826 | { |
827 | struct dentry *dentry; | 827 | struct dentry *dentry; |
828 | struct hlist_node *p; | ||
828 | 829 | ||
829 | spin_lock(&inode->i_lock); | 830 | spin_lock(&inode->i_lock); |
830 | list_for_each_entry(dentry, &inode->i_dentry, d_alias) { | 831 | hlist_for_each_entry(dentry, p, &inode->i_dentry, d_alias) { |
831 | if (!d_unhashed(dentry) || IS_ROOT(dentry)) { | 832 | if (!d_unhashed(dentry) || IS_ROOT(dentry)) { |
832 | spin_unlock(&inode->i_lock); | 833 | spin_unlock(&inode->i_lock); |
833 | return true; | 834 | return true; |