summaryrefslogtreecommitdiffstats
path: root/fs/cifs/cifs_debug.c
diff options
context:
space:
mode:
authorSteve French2019-06-24 08:44:11 +0200
committerSteve French2019-07-08 05:37:43 +0200
commit73cf8085dc09442f17f32972d3cdec7232f1be55 (patch)
treeb865ef231fa82a09d26e86dbea3a624f1baaa3fd /fs/cifs/cifs_debug.c
parentcifs: Fix check for matching with existing mount (diff)
downloadkernel-qcow2-linux-73cf8085dc09442f17f32972d3cdec7232f1be55.tar.gz
kernel-qcow2-linux-73cf8085dc09442f17f32972d3cdec7232f1be55.tar.xz
kernel-qcow2-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/cifs_debug.c')
-rw-r--r--fs/cifs/cifs_debug.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/cifs/cifs_debug.c b/fs/cifs/cifs_debug.c
index ec933fb0b36e..a38d796f5ffe 100644
--- a/fs/cifs/cifs_debug.c
+++ b/fs/cifs/cifs_debug.c
@@ -240,9 +240,7 @@ static int cifs_debug_data_proc_show(struct seq_file *m, void *v)
#ifdef CONFIG_CIFS_XATTR
seq_printf(m, ",XATTR");
#endif
-#ifdef CONFIG_CIFS_ACL
seq_printf(m, ",ACL");
-#endif
seq_putc(m, '\n');
seq_printf(m, "CIFSMaxBufSize: %d\n", CIFSMaxBufSize);
seq_printf(m, "Active VFS Requests: %d\n", GlobalTotalActiveXid);