Merge branch 'rgwfs-fix-rgw-lookup' of https://github.com/cmgitdream/ceph into cmgitd...

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>

diff --cc src/rgw/rgw_file.cc
Simple merge

diff --cc src/rgw/rgw_file.h
index 0adbe257f1307edbce8dbeb7bb126f15185ccf5f,d630b60353abdb231e6ab0d7d47255191b44c63f..43c27553ab81bc824aaedb2ac501454a89fcb100
--- 1/src/rgw/rgw_file.h
--- 2/src/rgw/rgw_file.h
+++ b/src/rgw/rgw_file.h
@@@ -235,7 -234,7 +235,8 @@@ namespace rgw 
      static constexpr uint32_t FLAG_DELETED = 0x0080;
      static constexpr uint32_t FLAG_UNLINK_THIS = 0x0100;
      static constexpr uint32_t FLAG_LOCKED = 0x0200;
 -    static constexpr uint32_t FLAG_EXACT_MATCH = 0x0400;
 +    static constexpr uint32_t FLAG_STATELESS_OPEN = 0x0400;
++    static constexpr uint32_t FLAG_EXACT_MATCH = 0x0800;
  
  #define CREATE_FLAGS(x) \
      ((x) & ~(RGWFileHandle::FLAG_CREATE|RGWFileHandle::FLAG_LOCK))