]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
librgw: don't discard lookup result, fix signedness of min_size
authorMatt Benjamin <mbenjamin@redhat.com>
Tue, 1 Dec 2015 17:34:33 +0000 (12:34 -0500)
committerMatt Benjamin <mbenjamin@redhat.com>
Fri, 12 Feb 2016 17:06:07 +0000 (12:06 -0500)
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
src/rgw/rgw_file.cc

index 03be995d6a4728e912a8d69c04151930d91a19b9..f221c3e4491abbca04ead3d37f9d5840aa2a880b 100644 (file)
@@ -183,8 +183,7 @@ int rgw_mkdir(struct rgw_fs *rgw_fs,
     rc = librgw.get_fe()->execute_req(&req);
   } else {
     /* pseudofs */
-    LookupFHResult fhr =
-      fs->lookup_fh(parent, name, RGWFileHandle::FLAG_PSEUDO);
+    fhr = fs->lookup_fh(parent, name, RGWFileHandle::FLAG_PSEUDO);
   }
 
   rgw_fh = get<0>(fhr);
@@ -559,7 +558,7 @@ int rgw_write(struct rgw_fs *rgw_fs,
   int rc = librgw.get_fe()->execute_req(&req);
 
   /* XXX move into request */
-  ssize_t min_size = offset+length;
+  size_t min_size = offset+length;
   if (min_size > rgw_fh->get_size())
     rgw_fh->set_size(min_size);