diff options
| author | Steve French | 2019-06-24 08:44:11 +0200 |
|---|---|---|
| committer | Steve French | 2019-07-08 05:37:43 +0200 |
| commit | 73cf8085dc09442f17f32972d3cdec7232f1be55 (patch) | |
| tree | b865ef231fa82a09d26e86dbea3a624f1baaa3fd /fs/cifs/Makefile | |
| parent | cifs: Fix check for matching with existing mount (diff) | |
| download | kernel-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/Makefile')
| -rw-r--r-- | fs/cifs/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/cifs/Makefile b/fs/cifs/Makefile index 51af69a1a328..41332f20055b 100644 --- a/fs/cifs/Makefile +++ b/fs/cifs/Makefile @@ -10,10 +10,9 @@ cifs-y := trace.o cifsfs.o cifssmb.o cifs_debug.o connect.o dir.o file.o \ cifs_unicode.o nterr.o cifsencrypt.o \ readdir.o ioctl.o sess.o export.o smb1ops.o winucase.o \ smb2ops.o smb2maperror.o smb2transport.o \ - smb2misc.o smb2pdu.o smb2inode.o smb2file.o + smb2misc.o smb2pdu.o smb2inode.o smb2file.o cifsacl.o cifs-$(CONFIG_CIFS_XATTR) += xattr.o -cifs-$(CONFIG_CIFS_ACL) += cifsacl.o cifs-$(CONFIG_CIFS_UPCALL) += cifs_spnego.o |