aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-11-19 06:06:39 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2011-11-19 06:06:39 -0500
commit208f6f6068836e10d526e87fef6ca4364f4ec068 (patch)
treeb9558820a176572b529ca6c1473b7c5ddb4b08ec /include
parentMerge branch 'for-linus' of git://oss.sgi.com/xfs/xfs (diff)
parentnew helper: mount_subtree() (diff)
downloadlinux-dev-208f6f6068836e10d526e87fef6ca4364f4ec068.tar.xz
linux-dev-208f6f6068836e10d526e87fef6ca4364f4ec068.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: new helper: mount_subtree() switch create_mnt_ns() to saner calling conventions, fix double mntput() in nfs btrfs: fix double mntput() in mount_subvol()
Diffstat (limited to 'include')
-rw-r--r--include/linux/fs.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 0c4df261af7e..e3130220ce3e 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1886,6 +1886,7 @@ extern struct dentry *mount_single(struct file_system_type *fs_type,
extern struct dentry *mount_nodev(struct file_system_type *fs_type,
int flags, void *data,
int (*fill_super)(struct super_block *, void *, int));
+extern struct dentry *mount_subtree(struct vfsmount *mnt, const char *path);
void generic_shutdown_super(struct super_block *sb);
void kill_block_super(struct super_block *sb);
void kill_anon_super(struct super_block *sb);