diff options
| author | Dan Robertson <dan@dlrobertson.com> | 2021-06-05 19:03:16 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-10-22 17:09:05 -0400 |
| commit | 59e2480ff7360b5c6ecd418aee795a7087a3e8f6 (patch) | |
| tree | 5e0c7ccb8060fd97ffdd01a1a57d33fc8d458306 /fs | |
| parent | 66a0a49750d77926a6d4b47d7ac1f4904094fb7e (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>
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'fs')
| -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 dad2fe2530e5..af3b83f871df 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 \ @@ -59,3 +58,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 f18a795620d8..1993bfcee788 100644 --- a/fs/bcachefs/xattr.c +++ b/fs/bcachefs/xattr.c @@ -562,8 +562,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 &nop_posix_acl_access, &nop_posix_acl_default, +#endif &bch_xattr_trusted_handler, &bch_xattr_security_handler, #ifndef NO_BCACHEFS_FS |