diff options
| author | Dan Robertson <dan@dlrobertson.com> | 2021-06-05 19:03:16 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2021-06-05 22:26:18 -0400 |
| commit | 4644baed0a380495367fcda713be3973ad081187 (patch) | |
| tree | 472c3ffe104cb001686e20124a3c673621443365 | |
| parent | 34c14d9f8a6a8ff08495356ae68b6a288a0c2b40 (diff) | |
bcachefs: do not compile acl mod on minimal config
Do not compile the acl.o target if BCACHEFS_POSIX_ACL is not enabled.
Signed-off-by: Dan Robertson <dan@dlrobertson.com>
| -rw-r--r-- | fs/bcachefs/Makefile | 3 | ||||
| -rw-r--r-- | fs/bcachefs/xattr.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/fs/bcachefs/Makefile b/fs/bcachefs/Makefile index 2fbf978424ed..ee5e6dbd5ede 100644 --- a/fs/bcachefs/Makefile +++ b/fs/bcachefs/Makefile @@ -2,7 +2,6 @@ obj-$(CONFIG_BCACHEFS_FS) += bcachefs.o bcachefs-y := \ - acl.o \ alloc_background.o \ alloc_foreground.o \ bkey.o \ @@ -58,3 +57,5 @@ bcachefs-y := \ util.o \ varint.o \ xattr.o + +bcachefs-$(CONFIG_BCACHEFS_POSIX_ACL) += acl.o diff --git a/fs/bcachefs/xattr.c b/fs/bcachefs/xattr.c index 858aa8766053..e7b40b3ca4aa 100644 --- a/fs/bcachefs/xattr.c +++ b/fs/bcachefs/xattr.c @@ -560,8 +560,10 @@ static const struct xattr_handler bch_xattr_bcachefs_effective_handler = { const struct xattr_handler *bch2_xattr_handlers[] = { &bch_xattr_user_handler, +#ifdef CONFIG_BCACHEFS_POSIX_ACL &posix_acl_access_xattr_handler, &posix_acl_default_xattr_handler, +#endif &bch_xattr_trusted_handler, &bch_xattr_security_handler, #ifndef NO_BCACHEFS_FS |