---

yaml --- r: 15865 b: refs/heads/master c: b563230 h: refs/heads/master i: 15863: b177c49 v: v3
git-mirror · Dec 13, 2005 · 1423391 · 1423391
1 parent 583eeab
commit 1423391
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 15 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 82033adf0a4b26eb0c0c90e224848431e2a59bc6
+refs/heads/master: b5632303401c231bf270ef36f1013e52caf4caf9
diff --git a/trunk/drivers/scsi/libata-core.c b/trunk/drivers/scsi/libata-core.c
@@ -3503,25 +3503,16 @@ struct ata_queued_cmd *ata_qc_new_init(struct ata_port *ap,
 static void __ata_qc_complete(struct ata_queued_cmd *qc)
 {
 	struct ata_port *ap = qc->ap;
-	unsigned int tag, do_clear = 0;
+	unsigned int tag;
 
 	qc->flags = 0;
 	tag = qc->tag;
 	if (likely(ata_tag_valid(tag))) {
 		if (tag == ap->active_tag)
 			ap->active_tag = ATA_TAG_POISON;
 		qc->tag = ATA_TAG_POISON;
-		do_clear = 1;
-	}
-
-	if (qc->waiting) {
-		struct completion *waiting = qc->waiting;
-		qc->waiting = NULL;
-		complete(waiting);
-	}
-
-	if (likely(do_clear))
 		clear_bit(tag, &ap->qactive);
+	}
 }
 
 /**
@@ -3537,7 +3528,6 @@ static void __ata_qc_complete(struct ata_queued_cmd *qc)
 void ata_qc_free(struct ata_queued_cmd *qc)
 {
 	assert(qc != NULL);	/* ata_qc_from_tag _might_ return NULL */
-	assert(qc->waiting == NULL);	/* nothing should be waiting */
 
 	__ata_qc_complete(qc);
 }

diff --git a/trunk/include/linux/libata.h b/trunk/include/linux/libata.h
@@ -285,8 +285,6 @@ struct ata_queued_cmd {
 
 	ata_qc_cb_t		complete_fn;
 
-	struct completion	*waiting;
-
 	void			*private_data;
 };
-Original file line number
+Diff line change
@@ Expand Up / @@ -285,8 +285,6 @@ struct ata_queued_cmd { @@
     	ata_qc_cb_t		complete_fn;
-    	struct completion	*waiting;
     	void			*private_data;
     };
@@ Expand Down @@