From: Guangyu Sun <guangyu.sun@oracle.com>
Date: Tue, 3 Jul 2012 23:51:43 +0000 (-0700)
Subject: fixed some merge errors
X-Git-Tag: v2.6.39-400.9.0~501
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=aad512a8bca0c010ecc477f58850fcf24a4f22fa;p=users%2Fjedix%2Flinux-maple.git

fixed some merge errors

Signed-off-by: Guangyu Sun <guangyu.sun@oracle.com>
---

diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
index 9232880bf5a1..5ef1f4c17e69 100644
--- a/block/scsi_ioctl.c
+++ b/block/scsi_ioctl.c
@@ -697,13 +697,8 @@ int scsi_verify_blk_ioctl(struct block_device *bd, unsigned int cmd)
 	if (bd && bd == bd->bd_contains)
 		return 0;
 
-<<<<<<< HEAD
 	/* Actually none of these is particularly useful on a partition,
 	 * but they are safe.
-=======
-	/* Actually none of this is particularly useful on a partition
-	 * device, but let's play it safe.
->>>>>>> acd92ae52cc861cfd30589404aed0dc2aafd44d0
 	 */
 	switch (cmd) {
 	case SCSI_IOCTL_GET_IDLUN:
@@ -717,7 +712,6 @@ int scsi_verify_blk_ioctl(struct block_device *bd, unsigned int cmd)
 	case SG_SET_RESERVED_SIZE:
 	case SG_EMULATED_HOST:
 		return 0;
-<<<<<<< HEAD
 	case CDROM_GET_CAPABILITY:
 		/* Keep this until we remove the printk below.  udev sends it
 		 * and we do not want to spam dmesg about it.   CD-ROMs do
@@ -733,13 +727,6 @@ int scsi_verify_blk_ioctl(struct block_device *bd, unsigned int cmd)
 			   "%s: sending ioctl %x to a partition!\n", current->comm, cmd);
 
 	return capable(CAP_SYS_RAWIO) ? 0 : -ENOTTY;
-=======
-	default:
-		break;
-	}
-	/* In particular, rule out all resets and host-specific ioctls.  */
-	return -ENOTTY;
->>>>>>> acd92ae52cc861cfd30589404aed0dc2aafd44d0
 }
 EXPORT_SYMBOL(scsi_verify_blk_ioctl);
 
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c
index 1b7903150489..b9bdd195d7fc 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_main.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c
@@ -832,14 +832,9 @@ static int ipoib_hard_header(struct sk_buff *skb,
 	 * destination address into skb->cb so we can figure out where
 	 * to send the packet later.
 	 */
-	dst = skb_dst(skb);
-	n = NULL;
-	if (dst)
-		n = dst_get_neighbour_raw(dst);
-	if ((!dst || !n) && daddr) {
-		struct ipoib_pseudoheader *phdr =
-			(struct ipoib_pseudoheader *) skb_push(skb, sizeof *phdr);
-		memcpy(phdr->hwaddr, daddr, INFINIBAND_ALEN);
+	if (!skb_dst(skb)) {
+		struct ipoib_cb *cb = (struct ipoib_cb *) skb->cb;
+		memcpy(cb->hwaddr, daddr, INFINIBAND_ALEN);
 	}
 
 	return 0;
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
index e7018a22f2b3..8b6350606d57 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
@@ -258,18 +258,10 @@ static int ipoib_mcast_join_finish(struct ipoib_mcast *mcast,
 	netif_tx_lock_bh(dev);
 	while (!skb_queue_empty(&mcast->pkt_queue)) {
 		struct sk_buff *skb = skb_dequeue(&mcast->pkt_queue);
-		struct dst_entry *dst = skb_dst(skb);
-		struct neighbour *n = NULL;
 
 		netif_tx_unlock_bh(dev);
 
 		skb->dev = dev;
-		if (dst)
-			n = dst_get_neighbour_raw(dst);
-		if (!dst || !n) {
-			/* put pseudoheader back on for next time */
-			skb_push(skb, sizeof (struct ipoib_pseudoheader));
-		}
 
 		if (dev_queue_xmit(skb))
 			ipoib_warn(priv, "dev_queue_xmit failed to requeue packet\n");
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index 35bf732b6078..6b95f74a91d3 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -1749,33 +1749,6 @@ static void ip_rt_update_pmtu(struct dst_entry *dst, u32 mtu)
 	}
 }
 
-static int check_peer_redir(struct dst_entry *dst, struct inet_peer *peer)
-{
-	struct rtable *rt = (struct rtable *) dst;
-	__be32 orig_gw = rt->rt_gateway;
-	struct neighbour *n, *old_n;
-
-	dst_confirm(&rt->dst);
-
-	rt->rt_gateway = peer->redirect_learned.a4;
-	n = __arp_bind_neighbour(&rt->dst, rt->rt_gateway);
-	if (IS_ERR(n))
-		return PTR_ERR(n);
-	old_n = xchg(&rt->dst._neighbour, n);
-	if (old_n)
-		neigh_release(old_n);
-	if (!n || !(n->nud_state & NUD_VALID)) {
-		if (n)
-			neigh_event_send(n, NULL);
-		rt->rt_gateway = orig_gw;
-		return -EAGAIN;
-	} else {
-		rt->rt_flags |= RTCF_REDIRECTED;
-		call_netevent_notifiers(NETEVENT_NEIGH_UPDATE, n);
-	}
-	return 0;
-}
-
 static struct dst_entry *ipv4_dst_check(struct dst_entry *dst, u32 cookie)
 {
 	struct rtable *rt = (struct rtable *) dst;
diff --git a/net/sunrpc/svc_xprt.c b/net/sunrpc/svc_xprt.c
index 69dda93f161d..9d7ed0b48b51 100644
--- a/net/sunrpc/svc_xprt.c
+++ b/net/sunrpc/svc_xprt.c
@@ -973,15 +973,6 @@ void svc_close_all(struct svc_serv *serv)
 	BUG_ON(!list_empty(&serv->sv_tempsocks));
 }
 
-void svc_close_all(struct svc_serv *serv)
-{
-	svc_close_list(&serv->sv_tempsocks);
-	svc_close_list(&serv->sv_permsocks);
-	BUG_ON(!list_empty(&serv->sv_permsocks));
-	BUG_ON(!list_empty(&serv->sv_tempsocks));
-
-}
-
 /*
  * Handle defer and revisit of requests
  */