update ceph source to reef 18.1.2

[ceph.git] / ceph / src / rgw / rgw_request.h

diff --git a/ceph/src/rgw/rgw_request.h b/ceph/src/rgw/rgw_request.h
index 8a9005047e8ac7e0755a0ff75842f0225dd7715e..cd05f51c942422d9a1dae8aab946cb0bb693bf7e 100644 (file)
--- a/ceph/src/rgw/rgw_request.h
+++ b/ceph/src/rgw/rgw_request.h
@@ -1,8 +1,7 @@
 // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
 // vim: ts=8 sw=2 smarttab ft=cpp
 
-#ifndef RGW_REQUEST_H
-#define RGW_REQUEST_H
+#pragma once
 
 #include "rgw_common.h"
 #include "rgw_acl.h"
@@ -16,7 +15,7 @@
 struct RGWRequest
 {
   uint64_t id;
-  struct req_state *s;
+  req_state *s;
   RGWOp *op;
 
   explicit RGWRequest(uint64_t id) : id(id), s(NULL), op(NULL) {}
@@ -39,5 +38,3 @@ RGWLoadGenRequest(uint64_t req_id, const std::string& _m, const std::string& _r,
        : RGWRequest(req_id), method(_m), resource(_r), content_length(_cl),
                fail_flag(ff) {}
 };
-
-#endif /* RGW_REQUEST_H */