Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull vfs pile 2 (of many) from Al Viro: "Mostly Miklos' series this time" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: constify dcache.c inlined helpers where possible fuse: drop dentry on failed revalidate fuse: clean up return in fuse_dentry_revalidate() fuse: use d_materialise_unique() sysfs: use check_submounts_and_drop() nfs: use check_submounts_and_drop() gfs2: use check_submounts_and_drop() afs: use check_submounts_and_drop() vfs: check unlinked ancestors before mount vfs: check submounts and drop atomically vfs: add d_walk() vfs: restructure d_genocide()
This commit is contained in:
@@ -212,7 +212,7 @@ struct dentry_operations {
|
||||
|
||||
extern seqlock_t rename_lock;
|
||||
|
||||
static inline int dname_external(struct dentry *dentry)
|
||||
static inline int dname_external(const struct dentry *dentry)
|
||||
{
|
||||
return dentry->d_name.name != dentry->d_iname;
|
||||
}
|
||||
@@ -253,6 +253,7 @@ extern void d_prune_aliases(struct inode *);
|
||||
|
||||
/* test whether we have any submounts in a subdir tree */
|
||||
extern int have_submounts(struct dentry *);
|
||||
extern int check_submounts_and_drop(struct dentry *);
|
||||
|
||||
/*
|
||||
* This adds the entry to the hash queues.
|
||||
@@ -357,17 +358,17 @@ extern struct dentry *dget_parent(struct dentry *dentry);
|
||||
* Returns true if the dentry passed is not currently hashed.
|
||||
*/
|
||||
|
||||
static inline int d_unhashed(struct dentry *dentry)
|
||||
static inline int d_unhashed(const struct dentry *dentry)
|
||||
{
|
||||
return hlist_bl_unhashed(&dentry->d_hash);
|
||||
}
|
||||
|
||||
static inline int d_unlinked(struct dentry *dentry)
|
||||
static inline int d_unlinked(const struct dentry *dentry)
|
||||
{
|
||||
return d_unhashed(dentry) && !IS_ROOT(dentry);
|
||||
}
|
||||
|
||||
static inline int cant_mount(struct dentry *dentry)
|
||||
static inline int cant_mount(const struct dentry *dentry)
|
||||
{
|
||||
return (dentry->d_flags & DCACHE_CANT_MOUNT);
|
||||
}
|
||||
@@ -381,12 +382,12 @@ static inline void dont_mount(struct dentry *dentry)
|
||||
|
||||
extern void dput(struct dentry *);
|
||||
|
||||
static inline bool d_managed(struct dentry *dentry)
|
||||
static inline bool d_managed(const struct dentry *dentry)
|
||||
{
|
||||
return dentry->d_flags & DCACHE_MANAGED_DENTRY;
|
||||
}
|
||||
|
||||
static inline bool d_mountpoint(struct dentry *dentry)
|
||||
static inline bool d_mountpoint(const struct dentry *dentry)
|
||||
{
|
||||
return dentry->d_flags & DCACHE_MOUNTED;
|
||||
}
|
||||
|
Reference in New Issue
Block a user