From: Matt Benjamin <mbenjamin@redhat.com>
Date: Fri, 3 Feb 2017 18:44:45 +0000 (-0500)
Subject: rgw_file:  fix RGWLibFS::setattr for directory objects
X-Git-Tag: v12.0.0~15^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F13252%2Fhead;p=ceph.git

rgw_file:  fix RGWLibFS::setattr for directory objects

Fixes:  http://tracker.ceph.com/issues/18808

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

diff --git a/src/rgw/rgw_file.cc b/src/rgw/rgw_file.cc
index f8a57735fd84..2abe76b483c1 100644
--- a/src/rgw/rgw_file.cc
+++ b/src/rgw/rgw_file.cc
@@ -586,6 +586,10 @@ namespace rgw {
 
     string obj_name{rgw_fh->relative_object_name()};
 
+    if (rgw_fh->is_dir()) {
+      obj_name += "/";
+    }
+
     RGWSetAttrsRequest req(cct, get_user(), rgw_fh->bucket_name(), obj_name);
 
     rgw_fh->create_stat(st, mask);