From: Greg Farnum Date: Thu, 14 Jan 2016 18:24:15 +0000 (-0800) Subject: Merge remote-tracking branch 'origin/wip-libcephfs-acl' into greg-fs-testing X-Git-Tag: v10.0.3~48^2~3 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e7dc5fb7988785afb934de30cd1004bd3ce7a26d;p=ceph.git Merge remote-tracking branch 'origin/wip-libcephfs-acl' into greg-fs-testing https://github.com/ceph/ceph/pull/5658 Reviewed-by: John Spray Conflicts: src/common/config_opts.h Signed-off-by: Greg Farnum --- e7dc5fb7988785afb934de30cd1004bd3ce7a26d diff --cc src/common/config_opts.h index a923645d30f4,994bae80c562..4458ce2c7ad3 --- a/src/common/config_opts.h +++ b/src/common/config_opts.h @@@ -366,7 -366,8 +366,9 @@@ OPTION(client_debug_inject_tick_delay, OPTION(client_max_inline_size, OPT_U64, 4096) OPTION(client_inject_release_failure, OPT_BOOL, false) // synthetic client bug for testing OPTION(client_inject_fixed_oldest_tid, OPT_BOOL, false) // synthetic client bug for testing +OPTION(client_metadata, OPT_STR, "") + OPTION(client_acl_type, OPT_STR, "") + OPTION(client_permissions, OPT_BOOL, true) // note: the max amount of "in flight" dirty data is roughly (max - target) OPTION(fuse_use_invalidate_cb, OPT_BOOL, false) // use fuse 2.8+ invalidate callback to keep page cache consistent