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: v10.2.7~16^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F13778%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>
(cherry picked from commit 4ad5a9226852d6d564baf2e63278ed6c4c185ecb)
---

diff --git a/src/rgw/rgw_file.cc b/src/rgw/rgw_file.cc
index b87c388cb665a..6325dc3a6ad51 100644
--- a/src/rgw/rgw_file.cc
+++ b/src/rgw/rgw_file.cc
@@ -571,6 +571,10 @@ namespace rgw {
     buffer::list ux_key, ux_attrs;
     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);