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 9232880bf5a1d7a790039508e70508f0d6e63ab0..5ef1f4c17e698457186b61736a0fa02f6594eb7f 100644 (file)
--- 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 1b79031504896c76f14f3f8492da05a3a72be95c..b9bdd195d7fc2fd2611e9ba0a93157517ffe5308 100644 (file)
--- 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 e7018a22f2b35396e2855cc55a36f9af8da1a971..8b6350606d57395e3f7825f3edd0d6f22ee4ba4b 100644 (file)
--- 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 35bf732b60783db43b171dd3dbb9f3698a32c73a..6b95f74a91d3f87c5d6b4f2bcef7dc35b671882d 100644 (file)
--- 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 69dda93f161d2f4df06ab5b55841be4760c52c29..9d7ed0b48b515f8edfb84ecb6eadf2749cf86600 100644 (file)
--- 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
  */