From: Darrick J. Wong <djwong@xxxxxxxxxx>
Allow some control over whether or not ACLs get used, though for kernel
mode it will always be enabled.
Signed-off-by: "Darrick J. Wong" <djwong@xxxxxxxxxx>
---
misc/fuse2fs.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/misc/fuse2fs.c b/misc/fuse2fs.c
index 40105368775a93..a0e5d601e55877 100644
--- a/misc/fuse2fs.c
+++ b/misc/fuse2fs.c
@@ -160,6 +160,7 @@ struct fuse2fs {
uint8_t norecovery;
uint8_t kernel;
uint8_t directio;
+ uint8_t acl;
unsigned long offset;
unsigned int next_generation;
unsigned long long cache_size;
@@ -648,6 +649,10 @@ static void *op_init(struct fuse_conn_info *conn
#ifdef FUSE_CAP_IOCTL_DIR
conn->want |= FUSE_CAP_IOCTL_DIR;
#endif
+#ifdef FUSE_CAP_POSIX_ACL
+ if (ff->acl)
+ conn->want |= FUSE_CAP_POSIX_ACL;
+#endif
#if FUSE_VERSION >= FUSE_MAKE_VERSION(3, 0)
conn->time_gran = 1;
cfg->use_ino = 1;
@@ -3813,8 +3818,9 @@ static struct fuse_opt fuse2fs_opts[] = {
FUSE2FS_OPT("offset=%lu", offset, 0),
FUSE2FS_OPT("kernel", kernel, 1),
FUSE2FS_OPT("directio", directio, 1),
+ FUSE2FS_OPT("acl", acl, 1),
+ FUSE2FS_OPT("noacl", acl, 0),
- FUSE_OPT_KEY("acl", FUSE2FS_IGNORED),
FUSE_OPT_KEY("user_xattr", FUSE2FS_IGNORED),
FUSE_OPT_KEY("noblock_validity", FUSE2FS_IGNORED),
FUSE_OPT_KEY("cache_size=%s", FUSE2FS_CACHE_SIZE),
