diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-24 11:51:15 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-24 11:51:15 -0400 |
| commit | 5dd12af05ca6b7d052c06a9ca4ff755fdfa25ae4 (patch) | |
| tree | 15189e860b8fb4e20b1517c8ec2d2e145a2c0017 /include | |
| parent | 8f7544682c488dfc4117b37ed10435bb2d3d8d73 (diff) | |
| parent | dea3667bc3c2a0521e8d8855e407a49d9d70028c (diff) | |
Merge branch 'dcache-cleanup'
* dcache-cleanup:
vfs: get rid of insane dentry hashing rules
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/dcache.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/dcache.h b/include/linux/dcache.h index f2afed4fa945..19d90a55541d 100644 --- a/include/linux/dcache.h +++ b/include/linux/dcache.h | |||
| @@ -197,7 +197,7 @@ struct dentry_operations { | |||
| 197 | * typically using d_splice_alias. */ | 197 | * typically using d_splice_alias. */ |
| 198 | 198 | ||
| 199 | #define DCACHE_REFERENCED 0x0008 /* Recently used, don't discard. */ | 199 | #define DCACHE_REFERENCED 0x0008 /* Recently used, don't discard. */ |
| 200 | #define DCACHE_UNHASHED 0x0010 | 200 | #define DCACHE_RCUACCESS 0x0010 /* Entry has ever been RCU-visible */ |
| 201 | #define DCACHE_INOTIFY_PARENT_WATCHED 0x0020 | 201 | #define DCACHE_INOTIFY_PARENT_WATCHED 0x0020 |
| 202 | /* Parent inode is watched by inotify */ | 202 | /* Parent inode is watched by inotify */ |
| 203 | 203 | ||
| @@ -384,7 +384,7 @@ extern struct dentry *dget_parent(struct dentry *dentry); | |||
| 384 | 384 | ||
| 385 | static inline int d_unhashed(struct dentry *dentry) | 385 | static inline int d_unhashed(struct dentry *dentry) |
| 386 | { | 386 | { |
| 387 | return (dentry->d_flags & DCACHE_UNHASHED); | 387 | return hlist_bl_unhashed(&dentry->d_hash); |
| 388 | } | 388 | } |
| 389 | 389 | ||
| 390 | static inline int d_unlinked(struct dentry *dentry) | 390 | static inline int d_unlinked(struct dentry *dentry) |