This is a preparation for a common work.fn handler for all requests.

Signed-off-by: Christoph Hellwig <hch@lst.de>

---
 sheep/gateway.c    |    4 ++--
 sheep/sdnet.c      |    3 +++
 sheep/sheep_priv.h |    2 +-
 sheep/store.c      |   15 ++++-----------
 4 files changed, 10 insertions(+), 14 deletions(-)

Index: sheepdog/sheep/sdnet.c
===================================================================
--- sheepdog.orig/sheep/sdnet.c	2012-07-03 21:29:21.733685520 +0200
+++ sheepdog/sheep/sdnet.c	2012-07-03 21:29:23.750352175 +0200
@@ -262,6 +262,9 @@ static void queue_io_request(struct requ
 			return;
 	}
 
+	if (req->rq.flags & SD_FLAG_CMD_RECOVERY)
+		req->rq.epoch = req->rq.obj.tgt_epoch;
+
 	req->work.fn = do_io_request;
 	req->work.done = io_op_done;
 	queue_work(sys->io_wqueue, &req->work);
Index: sheepdog/sheep/store.c
===================================================================
--- sheepdog.orig/sheep/store.c	2012-07-03 21:29:12.097018910 +0200
+++ sheepdog/sheep/store.c	2012-07-03 21:29:31.347018796 +0200
@@ -87,9 +87,6 @@ void do_io_request(struct work *work)
 	struct request *req = container_of(work, struct request, work);
 	int ret;
 
-	if (req->rq.flags & SD_FLAG_CMD_RECOVERY)
-		req->rq.epoch = req->rq.obj.tgt_epoch;
-
 	dprintf("%x, %" PRIx64" , %u\n",
 		req->rq.opcode, req->rq.obj.oid, req->rq.epoch);
 


