[XFS] Fix merge failures

Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	fs/xfs/linux-2.6/xfs_cred.h
	fs/xfs/linux-2.6/xfs_globals.h
	fs/xfs/linux-2.6/xfs_ioctl.c
	fs/xfs/xfs_vnodeops.h

Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>

1 files changed, 22 insertions, 19 deletions

diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c
index d7b3c6d398ae..a51fb33e6864 100644
--- a/net/ipv6/mcast.c
+++ b/net/ipv6/mcast.c
@@ -303,20 +303,23 @@ static struct inet6_dev *ip6_mc_find_dev(struct net *net,
                 dev = dev_get_by_index(net, ifindex);
 
         if (!dev)
-                return NULL;
+                goto nodev;
         idev = in6_dev_get(dev);
-        if (!idev) {
-                dev_put(dev);
-                return NULL;
-        }
+        if (!idev)
+                goto release;
         read_lock_bh(&idev->lock);
-        if (idev->dead) {
-                read_unlock_bh(&idev->lock);
-                in6_dev_put(idev);
-                dev_put(dev);
-                return NULL;
-        }
+        if (idev->dead)
+                goto unlock_release;
+
         return idev;
+
+unlock_release:
+        read_unlock_bh(&idev->lock);
+        in6_dev_put(idev);
+release:
+        dev_put(dev);
+nodev:
+        return NULL;
 }
 
 void ipv6_sock_mc_close(struct sock *sk)
@@ -1466,7 +1469,7 @@ static void mld_sendpack(struct sk_buff *skb)
                          &ipv6_hdr(skb)->saddr, &ipv6_hdr(skb)->daddr,
                          skb->dev->ifindex);
 
-        err = xfrm_lookup(&skb->dst, &fl, NULL, 0);
+        err = xfrm_lookup(net, &skb->dst, &fl, NULL, 0);
         if (err)
                 goto err_out;
 
@@ -1817,7 +1820,7 @@ static void igmp6_send(struct in6_addr *addr, struct net_device *dev, int type)
 
         hdr->icmp6_cksum = csum_ipv6_magic(saddr, snd_addr, len,
                                            IPPROTO_ICMPV6,
-                                           csum_partial((__u8 *) hdr, len, 0));
+                                           csum_partial(hdr, len, 0));
 
         idev = in6_dev_get(skb->dev);
 
@@ -1831,7 +1834,7 @@ static void igmp6_send(struct in6_addr *addr, struct net_device *dev, int type)
                          &ipv6_hdr(skb)->saddr, &ipv6_hdr(skb)->daddr,
                          skb->dev->ifindex);
 
-        err = xfrm_lookup(&skb->dst, &fl, NULL, 0);
+        err = xfrm_lookup(net, &skb->dst, &fl, NULL, 0);
         if (err)
                 goto err_out;
 
@@ -2430,9 +2433,9 @@ static int igmp6_mc_seq_show(struct seq_file *seq, void *v)
         struct igmp6_mc_iter_state *state = igmp6_mc_seq_private(seq);
 
         seq_printf(seq,
-                   "%-4d %-15s " NIP6_SEQFMT " %5d %08X %ld\n",
+                   "%-4d %-15s %pi6 %5d %08X %ld\n",
                    state->dev->ifindex, state->dev->name,
-                   NIP6(im->mca_addr),
+                   &im->mca_addr,
                    im->mca_users, im->mca_flags,
                    (im->mca_flags&MAF_TIMER_RUNNING) ?
                    jiffies_to_clock_t(im->mca_timer.expires-jiffies) : 0);
@@ -2591,10 +2594,10 @@ static int igmp6_mcf_seq_show(struct seq_file *seq, void *v)
                            "Source Address", "INC", "EXC");
         } else {
                 seq_printf(seq,
-                           "%3d %6.6s " NIP6_SEQFMT " " NIP6_SEQFMT " %6lu %6lu\n",
+                           "%3d %6.6s %pi6 %pi6 %6lu %6lu\n",
                            state->dev->ifindex, state->dev->name,
-                           NIP6(state->im->mca_addr),
-                           NIP6(psf->sf_addr),
+                           &state->im->mca_addr,
+                           &psf->sf_addr,
                            psf->sf_count[MCAST_INCLUDE],
                            psf->sf_count[MCAST_EXCLUDE]);
         }