Merge remote-tracking branch 'origin/wip-libcephfs-acl' into greg-fs-testing

https://github.com/ceph/ceph/pull/5658

Reviewed-by: John Spray <jspray@redhat.com>
Conflicts:
	src/common/config_opts.h

Signed-off-by: Greg Farnum <gfarnum@redhat.com>

diff --cc src/client/Client.cc
Simple merge

diff --cc src/client/Client.h
Simple merge

diff --cc src/common/config_opts.h
index a923645d30f43d48b1e60d12abc487ee18b203c0,994bae80c56213b207e977e49512f64c3854fbd6..4458ce2c7ad33d32fba7593de5b322c9d992dd92
--- 1/src/common/config_opts.h
--- 2/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

diff --cc src/include/ceph_fs.h
Simple merge