[sheepdog] [PATCH 1/2] sheep: comment out store->begin_recover

Liu Yuan namei.unix at gmail.com
Wed Mar 20 11:25:53 CET 2013


From: Liu Yuan <tailai.ly at taobao.com>

No users currently, so comment it out for possible use. This will remove
unnecessary if check for now.

Signed-off-by: Liu Yuan <tailai.ly at taobao.com>
---
 sheep/recovery.c   |    6 ------
 sheep/sheep_priv.h |    2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/sheep/recovery.c b/sheep/recovery.c
index 54966fe..9ef7abc 100644
--- a/sheep/recovery.c
+++ b/sheep/recovery.c
@@ -660,12 +660,6 @@ int start_recovery(struct vnode_info *cur_vinfo, struct vnode_info *old_vinfo)
 	rw->work.fn = prepare_object_list;
 	rw->work.done = finish_object_list;
 
-	if (sd_store->begin_recover) {
-		struct siocb iocb = { 0 };
-		iocb.epoch = rw->epoch;
-		sd_store->begin_recover(&iocb);
-	}
-
 	if (recovering_work != NULL) {
 		/* skip the previous epoch recovery */
 		if (next_rw)
diff --git a/sheep/sheep_priv.h b/sheep/sheep_priv.h
index 003f3c9..1c2fb2d 100644
--- a/sheep/sheep_priv.h
+++ b/sheep/sheep_priv.h
@@ -159,7 +159,7 @@ struct store_driver {
 	int (*remove_object)(uint64_t oid);
 	/* Operations in recovery */
 	int (*link)(uint64_t oid, uint32_t tgt_epoch);
-	int (*begin_recover)(const struct siocb *);
+	/* int (*begin_recover)(const struct siocb *); */
 	int (*end_recover)(uint32_t epoch,
 			   const struct vnode_info *old_vnode_info);
 	int (*purge_obj)(void);
-- 
1.7.9.5




More information about the sheepdog mailing list