aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordavem <davem>2001-12-12 09:19:18 +0000
committerdavem <davem>2001-12-12 09:19:18 +0000
commit92485e4f1057297645b19aaeb8db114a43f31371 (patch)
tree87b0cca289b253f19b3ba4eb8f3e128bb6ffd42a
parent63cc3017ddad2be5f50331c8394d61d5103556ac (diff)
downloadnetdev-vger-cvs-92485e4f1057297645b19aaeb8db114a43f31371.tar.gz
Fix MERGEABLE_BUFFERS check in back
merge function, args should be req->biotail, bio
-rw-r--r--drivers/scsi/scsi_merge.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/scsi_merge.c b/drivers/scsi/scsi_merge.c
index 9d455e895..140933cc2 100644
--- a/drivers/scsi/scsi_merge.c
+++ b/drivers/scsi/scsi_merge.c
@@ -307,7 +307,7 @@ __inline static int __scsi_back_merge_fn(request_queue_t * q,
}
#ifdef DMA_CHUNK_SIZE
- if (MERGEABLE_BUFFERS(bio, req->bio))
+ if (MERGEABLE_BUFFERS(req->biotail, bio))
return scsi_new_mergeable(q, req, bio);
#endif