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/cifsglob.h | |
| parent | 6552d6a0264de505d3bb1445aecf757b1ec3873a (diff) | |
| download | linux-next-73cf8085dc09442f17f32972d3cdec7232f1be55.tar.gz | |
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/cifsglob.h')
| -rw-r--r-- | fs/cifs/cifsglob.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h index 88c98fa15f39..16f240911192 100644 --- a/fs/cifs/cifsglob.h +++ b/fs/cifs/cifsglob.h @@ -1871,7 +1871,6 @@ extern unsigned int cifs_min_small; /* min size of small buf pool */ extern unsigned int cifs_max_pending; /* MAX requests at once to server*/ extern bool disable_legacy_dialects; /* forbid vers=1.0 and vers=2.0 mounts */ -#ifdef CONFIG_CIFS_ACL GLOBAL_EXTERN struct rb_root uidtree; GLOBAL_EXTERN struct rb_root gidtree; GLOBAL_EXTERN spinlock_t siduidlock; @@ -1880,7 +1879,6 @@ GLOBAL_EXTERN struct rb_root siduidtree; GLOBAL_EXTERN struct rb_root sidgidtree; GLOBAL_EXTERN spinlock_t uidsidlock; GLOBAL_EXTERN spinlock_t gidsidlock; -#endif /* CONFIG_CIFS_ACL */ void cifs_oplock_break(struct work_struct *work); void cifs_queue_oplock_break(struct cifsFileInfo *cfile); |