From 89650184a16572382f5a3dbe9fd15143b332f2eb Mon Sep 17 00:00:00 2001
From: Yi Zou <yi.zou@intel.com>
Date: Wed, 29 Jul 2009 17:05:40 -0700
Subject: [PATCH] --- yaml --- r: 161031 b: refs/heads/master c:
 53fcfbbef569819706b880a502ff62e2852edfce h: refs/heads/master i:   161029:
 56a4d9a809d7a4047d83e4e2313945d6fd3ed15f   161027:
 43a90d159b06a5267b7bd0681bf9e1f9533618ab   161023:
 82548dbeaf3779415ee8e4fed94485e94a29b97e v: v3

---
 [refs]                            |  2 +-
 trunk/drivers/scsi/libfc/fc_fcp.c | 27 ---------------------------
 2 files changed, 1 insertion(+), 28 deletions(-)

diff --git a/[refs] b/[refs]
index 8bec4f3797b0..e38d39fc959c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 537029f8e950776951ca2a3fe30121d5c05643d1
+refs/heads/master: 53fcfbbef569819706b880a502ff62e2852edfce
diff --git a/trunk/drivers/scsi/libfc/fc_fcp.c b/trunk/drivers/scsi/libfc/fc_fcp.c
index 2069edf80268..7d5ffcbbf39b 100644
--- a/trunk/drivers/scsi/libfc/fc_fcp.c
+++ b/trunk/drivers/scsi/libfc/fc_fcp.c
@@ -507,33 +507,6 @@ static int fc_fcp_send_data(struct fc_fcp_pkt *fsp, struct fc_seq *seq,
 	f_ctl = FC_FC_REL_OFF;
 	WARN_ON(!seq);
 
-	/*
-	 * If a get_page()/put_page() will fail, don't use sg lists
-	 * in the fc_frame structure.
-	 *
-	 * The put_page() may be long after the I/O has completed
-	 * in the case of FCoE, since the network driver does it
-	 * via free_skb().  See the test in free_pages_check().
-	 *
-	 * Test this case with 'dd </dev/zero >/dev/st0 bs=64k'.
-	 */
-	if (using_sg) {
-		for (sg = scsi_sglist(sc); sg; sg = sg_next(sg)) {
-			if (page_count(sg_page(sg)) == 0 ||
-			    (sg_page(sg)->flags & (1 << PG_lru |
-						   1 << PG_private |
-						   1 << PG_locked |
-						   1 << PG_active |
-						   1 << PG_slab |
-						   1 << PG_swapcache |
-						   1 << PG_writeback |
-						   1 << PG_reserved |
-						   1 << PG_buddy))) {
-				using_sg = 0;
-				break;
-			}
-		}
-	}
 	sg = scsi_sglist(sc);
 
 	while (remaining > 0 && sg) {