diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-25 11:57:47 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-25 11:57:47 -0400 |
commit | 7ed7fe5e82c9fc8473974fbd7389d169b8f17c77 (patch) | |
tree | ff6ff57c88c887133f1585473e7d74981d0dc88c /fs/super.c | |
parent | a4083c9271e0a697278e089f2c0b9a95363ada0a (diff) | |
parent | a02f76c34d7d6d30b63ac64a8b34dea68593e8da (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
[PATCH] get stack footprint of pathname resolution back to relative sanity
[PATCH] double iput() on failure exit in hugetlb
[PATCH] double dput() on failure exit in tiny-shmem
[PATCH] fix up new filp allocators
[PATCH] check for null vfsmount in dentry_open()
[PATCH] reiserfs: eliminate private use of struct file in xattr
[PATCH] sanitize hppfs
hppfs pass vfsmount to dentry_open()
[PATCH] restore export of do_kern_mount()
Diffstat (limited to 'fs/super.c')
-rw-r--r-- | fs/super.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/super.c b/fs/super.c index d0a941a4e620..09008dbd264e 100644 --- a/fs/super.c +++ b/fs/super.c | |||
@@ -945,6 +945,7 @@ do_kern_mount(const char *fstype, int flags, const char *name, void *data) | |||
945 | put_filesystem(type); | 945 | put_filesystem(type); |
946 | return mnt; | 946 | return mnt; |
947 | } | 947 | } |
948 | EXPORT_SYMBOL_GPL(do_kern_mount); | ||
948 | 949 | ||
949 | struct vfsmount *kern_mount_data(struct file_system_type *type, void *data) | 950 | struct vfsmount *kern_mount_data(struct file_system_type *type, void *data) |
950 | { | 951 | { |