diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2018-04-04 00:40:19 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2018-04-04 00:40:19 -0400 |
commit | 04bbc9795d2e89c79edf48fb1303ace2e8c90a60 (patch) | |
tree | d803d5fbedaa6d15c3db50a3b4113792a2e14b69 | |
parent | cbd4a5bcb25b5ed0c1c64bc969b893cad9b78acc (diff) | |
parent | 4ded097bed1663b307f353a0dd6ad931e345834e (diff) | |
download | linux-04bbc9795d2e89c79edf48fb1303ace2e8c90a60.tar.gz linux-04bbc9795d2e89c79edf48fb1303ace2e8c90a60.tar.bz2 linux-04bbc9795d2e89c79edf48fb1303ace2e8c90a60.zip |
Merge branch 'old.dcache' into work.dcache
-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 c84ffbfc5098..94acbde17bb1 100644 --- a/include/linux/dcache.h +++ b/include/linux/dcache.h @@ -359,7 +359,7 @@ static inline void dont_mount(struct dentry *dentry) extern void __d_lookup_done(struct dentry *); -static inline int d_in_lookup(struct dentry *dentry) +static inline int d_in_lookup(const struct dentry *dentry) { return dentry->d_flags & DCACHE_PAR_LOOKUP; } @@ -487,7 +487,7 @@ static inline bool d_really_is_positive(const struct dentry *dentry) return dentry->d_inode != NULL; } -static inline int simple_positive(struct dentry *dentry) +static inline int simple_positive(const struct dentry *dentry) { return d_really_is_positive(dentry) && !d_unhashed(dentry); } |