diff options
| author | Steve French <stfrench@microsoft.com> | 2019-06-24 01:44:11 -0500 |
|---|---|---|
| committer | Steve French <stfrench@microsoft.com> | 2019-07-07 22:37:43 -0500 |
| commit | 73cf8085dc09442f17f32972d3cdec7232f1be55 (patch) | |
| tree | b865ef231fa82a09d26e86dbea3a624f1baaa3fd /fs/cifs/cifssmb.c | |
| parent | 6552d6a0264de505d3bb1445aecf757b1ec3873a (diff) | |
| download | linux-73cf8085dc09442f17f32972d3cdec7232f1be55.tar.gz linux-73cf8085dc09442f17f32972d3cdec7232f1be55.tar.bz2 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/cifssmb.c')
| -rw-r--r-- | fs/cifs/cifssmb.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c index 1fbd92843a73..2ea28552f3f2 100644 --- a/fs/cifs/cifssmb.c +++ b/fs/cifs/cifssmb.c @@ -3920,7 +3920,6 @@ GetExtAttrOut: #endif /* CONFIG_POSIX */ -#ifdef CONFIG_CIFS_ACL /* * Initialize NT TRANSACT SMB into small smb request buffer. This assumes that * all NT TRANSACTS that we init here have total parm and data under about 400 @@ -4164,7 +4163,6 @@ setCifsAclRetry: return (rc); } -#endif /* CONFIG_CIFS_ACL */ /* Legacy Query Path Information call for lookup to old servers such as Win9x/WinME */ |