Merge branch 'old.dcache' into work.dcache

Al Viro · Al Viro · commit 04bbc9795d2e · 2018-04-04T00:40:19.000-04:00
diff --git 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);
 }

Original file line number	Diff line number	Diff line change
`@@ -359,7 +359,7 @@ static inline void dont_mount(struct dentry *dentry)`
`359`	`359`
`360`	`360`	`extern void __d_lookup_done(struct dentry *);`
`361`	`361`
`362`		`-static inline int d_in_lookup(struct dentry *dentry)`
	`362`	`+static inline int d_in_lookup(const struct dentry *dentry)`
`363`	`363`	`{`
`364`	`364`	`return dentry->d_flags & DCACHE_PAR_LOOKUP;`
`365`	`365`	`}`
`@@ -487,7 +487,7 @@ static inline bool d_really_is_positive(const struct dentry *dentry)`
`487`	`487`	`return dentry->d_inode != NULL;`
`488`	`488`	`}`
`489`	`489`
`490`		`-static inline int simple_positive(struct dentry *dentry)`
	`490`	`+static inline int simple_positive(const struct dentry *dentry)`
`491`	`491`	`{`
`492`	`492`	`return d_really_is_positive(dentry) && !d_unhashed(dentry);`
`493`	`493`	`}`