Skip to content

L
linux
Commit 04bbc979 authored by Al Viro's avatar Al Viro
Browse files
Options

Merge branch 'old.dcache' into work.dcache

parents cbd4a5bc 4ded097b
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
include/linux/dcache.h
View file @ 04bbc979
...@@ -359,7 +359,7 @@ static inline void dont_mount(struct dentry *dentry) ...@@ -359,7 +359,7 @@ static inline void dont_mount(struct dentry *dentry)
extern void __d_lookup_done(struct 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; return dentry->d_flags & DCACHE_PAR_LOOKUP;
} }
...@@ -487,7 +487,7 @@ static inline bool d_really_is_positive(const struct dentry *dentry) ...@@ -487,7 +487,7 @@ static inline bool d_really_is_positive(const struct dentry *dentry)
return dentry->d_inode != NULL; 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); return d_really_is_positive(dentry) && !d_unhashed(dentry);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7