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/xattr.c | |
| parent | cifs: Fix check for matching with existing mount (diff) | |
| download | linux-dev-73cf8085dc09442f17f32972d3cdec7232f1be55.tar.xz linux-dev-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/xattr.c')
| -rw-r--r-- | fs/cifs/xattr.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/fs/cifs/xattr.c b/fs/cifs/xattr.c index 50ddb795aaeb..9076150758d8 100644 --- a/fs/cifs/xattr.c +++ b/fs/cifs/xattr.c @@ -96,7 +96,6 @@ static int cifs_xattr_set(const struct xattr_handler *handler, break; case XATTR_CIFS_ACL: { -#ifdef CONFIG_CIFS_ACL struct cifs_ntsd *pacl; if (!value) @@ -117,7 +116,6 @@ static int cifs_xattr_set(const struct xattr_handler *handler, CIFS_I(inode)->time = 0; kfree(pacl); } -#endif /* CONFIG_CIFS_ACL */ break; } @@ -247,7 +245,6 @@ static int cifs_xattr_get(const struct xattr_handler *handler, break; case XATTR_CIFS_ACL: { -#ifdef CONFIG_CIFS_ACL u32 acllen; struct cifs_ntsd *pacl; @@ -270,7 +267,6 @@ static int cifs_xattr_get(const struct xattr_handler *handler, rc = acllen; kfree(pacl); } -#endif /* CONFIG_CIFS_ACL */ break; } |