diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2016-12-16 16:34:52 -0500 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2016-12-16 16:34:52 -0500 |
| commit | 9763f7a4a5f7b1a7c480fa06d01b2bad25163c0a (patch) | |
| tree | 63e3f777b699ec26761eab948c40d70bba1476b0 /include | |
| parent | 3c55d6bcfe8163ff2b5636b4aabe3caa3f5d95f4 (diff) | |
| parent | 1c4344a50d702307185cb98fb67bff938cd66aa0 (diff) | |
| download | op-kernel-dev-9763f7a4a5f7b1a7c480fa06d01b2bad25163c0a.zip op-kernel-dev-9763f7a4a5f7b1a7c480fa06d01b2bad25163c0a.tar.gz | |
Merge branch 'work.autofs' into for-linus
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/dcache.h | 4 | ||||
| -rw-r--r-- | include/linux/mount.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/linux/dcache.h b/include/linux/dcache.h index 5beed7b..c965e44 100644 --- a/include/linux/dcache.h +++ b/include/linux/dcache.h @@ -139,7 +139,7 @@ struct dentry_operations { void (*d_iput)(struct dentry *, struct inode *); char *(*d_dname)(struct dentry *, char *, int); struct vfsmount *(*d_automount)(struct path *); - int (*d_manage)(struct dentry *, bool); + int (*d_manage)(const struct path *, bool); struct dentry *(*d_real)(struct dentry *, const struct inode *, unsigned int); } ____cacheline_aligned; @@ -254,7 +254,7 @@ extern struct dentry *d_find_alias(struct inode *); 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 path_has_submounts(const struct path *); /* * This adds the entry to the hash queues. diff --git a/include/linux/mount.h b/include/linux/mount.h index cf2b578..c6f5515 100644 --- a/include/linux/mount.h +++ b/include/linux/mount.h @@ -98,4 +98,6 @@ extern dev_t name_to_dev_t(const char *name); extern unsigned int sysctl_mount_max; +extern bool path_is_mountpoint(const struct path *path); + #endif /* _LINUX_MOUNT_H */ |
