From: Kefu Chai Date: Fri, 27 Feb 2015 08:53:21 +0000 (+0800) Subject: OSD: mark internal methods as `private` X-Git-Tag: v9.0.0~239^2~1 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=01c99d0af3aa1383577dfd876dfab3465e681e59;p=ceph.git OSD: mark internal methods as `private` Signed-off-by: Kefu Chai --- diff --git a/src/osd/OSD.h b/src/osd/OSD.h index a8e6990e90f7..b043d28dc59a 100644 --- a/src/osd/OSD.h +++ b/src/osd/OSD.h @@ -2302,6 +2302,17 @@ protected: private: static int write_meta(ObjectStore *store, uuid_d& cluster_fsid, uuid_d& osd_fsid, int whoami); + + void handle_rep_scrub(MOSDRepScrub *m); + void handle_scrub(struct MOSDScrub *m); + void handle_osd_ping(class MOSDPing *m); + void handle_op(OpRequestRef& op, OSDMapRef& osdmap); + + template + void handle_replica_op(OpRequestRef& op, OSDMapRef& osdmap); + + int init_op_flags(OpRequestRef& op); + public: static int peek_meta(ObjectStore *store, string& magic, uuid_d& cluster_fsid, uuid_d& osd_fsid, int& whoami); @@ -2317,22 +2328,10 @@ public: void handle_signal(int signum); - void handle_rep_scrub(MOSDRepScrub *m); - void handle_scrub(struct MOSDScrub *m); - void handle_osd_ping(class MOSDPing *m); - void handle_op(OpRequestRef& op, OSDMapRef& osdmap); - - template - void handle_replica_op(OpRequestRef& op, OSDMapRef& osdmap); - /// check if we can throw out op from a disconnected client - static bool op_is_discardable(class MOSDOp *m); - /// check if op should be (re)queued for processing -public: - void force_remount(); - - int init_op_flags(OpRequestRef& op); + static bool op_is_discardable(MOSDOp *m); +public: OSDService service; friend class OSDService; };