diff options
| author | David S. Miller <davem@davemloft.net> | 2011-01-24 16:17:06 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-01-24 16:17:06 -0500 |
| commit | e92427b289d252cfbd4cb5282d92f4ce1a5bb1fb (patch) | |
| tree | 6d30e5e7b7f8e9aaa51d43b7128ac56860fa03bb /fs/internal.h | |
| parent | c506653d35249bb4738bb139c24362e1ae724bc1 (diff) | |
| parent | ec30f343d61391ab23705e50a525da1d55395780 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs/internal.h')
| -rw-r--r-- | fs/internal.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/internal.h b/fs/internal.h index 9687c2ee2735..0663568b1247 100644 --- a/fs/internal.h +++ b/fs/internal.h | |||
| @@ -70,6 +70,10 @@ extern void mnt_set_mountpoint(struct vfsmount *, struct dentry *, | |||
| 70 | extern void release_mounts(struct list_head *); | 70 | extern void release_mounts(struct list_head *); |
| 71 | extern void umount_tree(struct vfsmount *, int, struct list_head *); | 71 | extern void umount_tree(struct vfsmount *, int, struct list_head *); |
| 72 | extern struct vfsmount *copy_tree(struct vfsmount *, struct dentry *, int); | 72 | extern struct vfsmount *copy_tree(struct vfsmount *, struct dentry *, int); |
| 73 | extern int finish_automount(struct vfsmount *, struct path *); | ||
| 74 | |||
| 75 | extern void mnt_make_longterm(struct vfsmount *); | ||
| 76 | extern void mnt_make_shortterm(struct vfsmount *); | ||
| 73 | 77 | ||
| 74 | extern void __init mnt_init(void); | 78 | extern void __init mnt_init(void); |
| 75 | 79 | ||