diff options
| author | Linus Torvalds | 2011-04-24 17:51:15 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2011-04-24 17:51:15 +0200 |
| commit | 5dd12af05ca6b7d052c06a9ca4ff755fdfa25ae4 (patch) | |
| tree | 15189e860b8fb4e20b1517c8ec2d2e145a2c0017 /include/linux | |
| parent | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| parent | vfs: get rid of insane dentry hashing rules (diff) | |
| download | kernel-qcow2-linux-5dd12af05ca6b7d052c06a9ca4ff755fdfa25ae4.tar.gz kernel-qcow2-linux-5dd12af05ca6b7d052c06a9ca4ff755fdfa25ae4.tar.xz kernel-qcow2-linux-5dd12af05ca6b7d052c06a9ca4ff755fdfa25ae4.zip | |
Merge branch 'dcache-cleanup'
* dcache-cleanup:
vfs: get rid of insane dentry hashing rules
Diffstat (limited to 'include/linux')
| -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 { * typically using d_splice_alias. */ #define DCACHE_REFERENCED 0x0008 /* Recently used, don't discard. */ -#define DCACHE_UNHASHED 0x0010 +#define DCACHE_RCUACCESS 0x0010 /* Entry has ever been RCU-visible */ #define DCACHE_INOTIFY_PARENT_WATCHED 0x0020 /* Parent inode is watched by inotify */ @@ -384,7 +384,7 @@ extern struct dentry *dget_parent(struct dentry *dentry); static inline int d_unhashed(struct dentry *dentry) { - return (dentry->d_flags & DCACHE_UNHASHED); + return hlist_bl_unhashed(&dentry->d_hash); } static inline int d_unlinked(struct dentry *dentry) |