[DRBD-cvs] svn commit by phil - r2342 - trunk/drbd - Fixes for issues pointed out by Simon Graham.

[drbd-cvs at lists.linbit.com]

Author: phil
Date: 2006-08-08 15:28:34 +0200 (Tue, 08 Aug 2006)
New Revision: 2342

Modified:
   trunk/drbd/drbd_receiver.c
   trunk/drbd/drbd_req.c
Log:
Fixes for issues pointed out by Simon Graham.
http://lists.linbit.com/pipermail/drbd-dev/2006-August/000378.html


Modified: trunk/drbd/drbd_receiver.c
===================================================================
--- trunk/drbd/drbd_receiver.c	2006-08-08 11:58:49 UTC (rev 2341)
+++ trunk/drbd/drbd_receiver.c	2006-08-08 13:28:34 UTC (rev 2342)
@@ -1442,7 +1442,8 @@
 	if(!inc_local(mdev) || mdev->state.disk < UpToDate ) {
 		if (DRBD_ratelimit(5*HZ,5))
 			ERR("Can not satisfy peer's read request, no local data.\n");
-		drbd_send_ack(mdev,NegDReply,e);
+		drbd_send_ack(mdev,h->command == DataRequest ? NegDReply :
+			      NegRSDReply ,e);
 		drbd_free_ee(mdev,e);
 		return TRUE;
 	}

Modified: trunk/drbd/drbd_req.c
===================================================================
--- trunk/drbd/drbd_req.c	2006-08-08 11:58:49 UTC (rev 2341)
+++ trunk/drbd/drbd_req.c	2006-08-08 13:28:34 UTC (rev 2342)
@@ -161,8 +161,7 @@
 
 int drbd_pr_verify(drbd_dev *mdev, drbd_request_t * req, sector_t sector)
 {
-	struct hlist_head *slot = mdev->app_reads_hash +
-		ar_hash_fn(mdev, drbd_req_get_sector(req) );
+	struct hlist_head *slot = mdev->app_reads_hash+ar_hash_fn(mdev,sector);
 	struct hlist_node *n;
 	drbd_request_t * i;
 	int rv=0;