From: Matt Benjamin <mbenjamin@redhat.com>
Date: Fri, 9 Sep 2016 01:48:38 +0000 (-0400)
Subject: Merge branch 'rgwfs-fix-rgw-lookup' of https://github.com/cmgitdream/ceph into cmgitd... 
X-Git-Tag: v11.0.1~284
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4b94d7fee37a3ff75614051b876acee5bce4365c;p=ceph.git

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

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

4b94d7fee37a3ff75614051b876acee5bce4365c
diff --cc src/rgw/rgw_file.h
index 0adbe257f130,d630b60353ab..43c27553ab81
--- a/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))