From: Matt Benjamin <mbenjamin@redhat.com>
Date: Tue, 1 Dec 2015 17:34:33 +0000 (-0500)
Subject: librgw: don't discard lookup result, fix signedness of min_size
X-Git-Tag: v10.1.0~382^2~139
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=42fc51a4ebb8d21000ce5499547f862b279a4164;p=ceph.git

librgw: don't discard lookup result, fix signedness of min_size

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

diff --git a/src/rgw/rgw_file.cc b/src/rgw/rgw_file.cc
index 03be995d6a47..f221c3e4491a 100644
--- a/src/rgw/rgw_file.cc
+++ b/src/rgw/rgw_file.cc
@@ -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);