diff options
| author | Steve French <stfrench@microsoft.com> | 2019-06-24 08:44:11 +0200 |
|---|---|---|
| committer | Steve French <stfrench@microsoft.com> | 2019-07-08 05:37:43 +0200 |
| commit | 73cf8085dc09442f17f32972d3cdec7232f1be55 (patch) | |
| tree | b865ef231fa82a09d26e86dbea3a624f1baaa3fd /fs/cifs/cifsfs.c | |
| parent | cifs: Fix check for matching with existing mount (diff) | |
| download | linux-73cf8085dc09442f17f32972d3cdec7232f1be55.tar.xz linux-73cf8085dc09442f17f32972d3cdec7232f1be55.zip | |
cifs: simplify code by removing CONFIG_CIFS_ACL ifdef
SMB3 ACL support is needed for many use cases now and should not be
ifdeffed out, even for SMB1 (CIFS). Remove the CONFIG_CIFS_ACL
ifdef so ACL support is always built into cifs.ko
Signed-off-by: Steve French <stfrench@microsoft.com>
Diffstat (limited to 'fs/cifs/cifsfs.c')
| -rw-r--r-- | fs/cifs/cifsfs.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c index 786e07754107..dc5fd7a648f0 100644 --- a/fs/cifs/cifsfs.c +++ b/fs/cifs/cifsfs.c @@ -1518,11 +1518,9 @@ init_cifs(void) goto out_destroy_dfs_cache; #endif /* CONFIG_CIFS_UPCALL */ -#ifdef CONFIG_CIFS_ACL rc = init_cifs_idmap(); if (rc) goto out_register_key_type; -#endif /* CONFIG_CIFS_ACL */ rc = register_filesystem(&cifs_fs_type); if (rc) @@ -1537,10 +1535,8 @@ init_cifs(void) return 0; out_init_cifs_idmap: -#ifdef CONFIG_CIFS_ACL exit_cifs_idmap(); out_register_key_type: -#endif #ifdef CONFIG_CIFS_UPCALL exit_cifs_spnego(); out_destroy_dfs_cache: @@ -1572,9 +1568,7 @@ exit_cifs(void) unregister_filesystem(&cifs_fs_type); unregister_filesystem(&smb3_fs_type); cifs_dfs_release_automount_timer(); -#ifdef CONFIG_CIFS_ACL exit_cifs_idmap(); -#endif #ifdef CONFIG_CIFS_UPCALL exit_cifs_spnego(); #endif |