Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHannes Reinecke <hare@suse.de>2015-06-18 16:17:23 +0200
committerJiri Kosina <jkosina@suse.cz>2015-06-23 18:02:31 +0200
commitfda0ead6b149286384f5218552c9bfe29a3d1c9f (patch)
tree65efbdd381b29c36693306b13d33b95343fb0dc7
parentf79c4c80101a581f8f497c059f8e14876650a9fd (diff)
Delete patches.suse/scsi-Debug-sg-tablesize-mismatch.patch (bsc#935120).
-rw-r--r--drivers/scsi/scsi_lib.c15
1 files changed, 1 insertions, 14 deletions
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index db7180f6b2b2..c61dbe422de4 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -992,20 +992,7 @@ void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes)
static int scsi_init_sgtable(struct request *req, struct scsi_data_buffer *sdb,
gfp_t gfp_mask)
{
- int count = 0;
- struct bio_vec *bvec;
- struct req_iterator iter;
-
- rq_for_each_segment(bvec, req, iter)
- count++;
-
- if (count > req->nr_phys_segments) {
- printk(KERN_WARNING "%s: sg tablesize mismatch, "
- "%d should be %d\n", __func__,
- count, req->nr_phys_segments);
- blk_dump_rq_flags(req, __func__);
- req->nr_phys_segments = count;
- }
+ int count;
/*
* If sg table allocation fails, requeue request later.