iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bcachefs: do not compile acl mod on minimal config

Browse Source 
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>
This commit is contained in:
Dan Robertson 2021-06-05 19:03:16 -04:00 committed by Kent Overstreet
parent 66a0a49750
commit 59e2480ff7
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fs/bcachefs/Makefile
View File

@ -2,7 +2,6 @@
obj-$(CONFIG_BCACHEFS_FS) += bcachefs.o obj-$(CONFIG_BCACHEFS_FS) += bcachefs.o
bcachefs-y := \ bcachefs-y := \
acl.o \
alloc_background.o \ alloc_background.o \
alloc_foreground.o \ alloc_foreground.o \
bkey.o \ bkey.o \
@ -59,3 +58,5 @@ bcachefs-y := \
util.o \ util.o \
varint.o \ varint.o \
xattr.o xattr.o
bcachefs-$(CONFIG_BCACHEFS_POSIX_ACL) += acl.o

2
fs/bcachefs/xattr.c
View File

@ -562,8 +562,10 @@ static const struct xattr_handler bch_xattr_bcachefs_effective_handler = {
const struct xattr_handler *bch2_xattr_handlers[] = { const struct xattr_handler *bch2_xattr_handlers[] = {
&bch_xattr_user_handler, &bch_xattr_user_handler,
#ifdef CONFIG_BCACHEFS_POSIX_ACL
&nop_posix_acl_access, &nop_posix_acl_access,
&nop_posix_acl_default, &nop_posix_acl_default,
#endif
&bch_xattr_trusted_handler, &bch_xattr_trusted_handler,
&bch_xattr_security_handler, &bch_xattr_security_handler,
#ifndef NO_BCACHEFS_FS #ifndef NO_BCACHEFS_FS