diff options
| author | Arjan van de Ven <arjan@linux.intel.com> | 2008-10-17 09:20:26 -0700 |
|---|---|---|
| committer | Arjan van de Ven <arjan@linux.intel.com> | 2008-10-17 09:20:26 -0700 |
| commit | 651dab4264e4ba0e563f5ff56f748127246e9065 (patch) | |
| tree | 016630974bdcb00fe529b673f96d389e0fd6dc94 /fs/autofs4/init.c | |
| parent | 40b8606253552109815786e5d4b0de98782d31f5 (diff) | |
| parent | 2e532d68a2b3e2aa6b19731501222069735c741c (diff) | |
| download | kernel_samsung_aries-651dab4264e4ba0e563f5ff56f748127246e9065.zip kernel_samsung_aries-651dab4264e4ba0e563f5ff56f748127246e9065.tar.gz kernel_samsung_aries-651dab4264e4ba0e563f5ff56f748127246e9065.tar.bz2 | |
Merge commit 'linus/master' into merge-linus
Conflicts:
arch/x86/kvm/i8254.c
Diffstat (limited to 'fs/autofs4/init.c')
| -rw-r--r-- | fs/autofs4/init.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/fs/autofs4/init.c b/fs/autofs4/init.c index 723a1c5e..9722e4b 100644 --- a/fs/autofs4/init.c +++ b/fs/autofs4/init.c @@ -29,11 +29,20 @@ static struct file_system_type autofs_fs_type = { static int __init init_autofs4_fs(void) { - return register_filesystem(&autofs_fs_type); + int err; + + err = register_filesystem(&autofs_fs_type); + if (err) + return err; + + autofs_dev_ioctl_init(); + + return err; } static void __exit exit_autofs4_fs(void) { + autofs_dev_ioctl_exit(); unregister_filesystem(&autofs_fs_type); } |