ext4: Fix return value of ext4_split_unwritten_extents() to fix direct I/O

[safe/jmp/linux-2.6] / fs / afs / netdevices.c

diff --git a/fs/afs/netdevices.c b/fs/afs/netdevices.c
index 2b30873..7ad3650 100644 (file)
--- a/fs/afs/netdevices.c
+++ b/fs/afs/netdevices.c
@@ -8,23 +8,35 @@
 #include <linux/inetdevice.h>
 #include <linux/netdevice.h>
 #include <linux/if_arp.h>
+#include <net/net_namespace.h>
 #include "internal.h"
 
-int afs_get_MAC_address(u8 mac[ETH_ALEN])
+/*
+ * get a MAC address from a random ethernet interface that has a real one
+ * - the buffer will normally be 6 bytes in size
+ */
+int afs_get_MAC_address(u8 *mac, size_t maclen)
 {
        struct net_device *dev;
        int ret = -ENODEV;
 
+       BUG_ON(maclen != ETH_ALEN);
+
        rtnl_lock();
-       dev = __dev_getfirstbyhwtype(ARPHRD_ETHER);
+       dev = __dev_getfirstbyhwtype(&init_net, ARPHRD_ETHER);
        if (dev) {
-               memcpy(mac, dev->dev_addr, ETH_ALEN);
+               memcpy(mac, dev->dev_addr, maclen);
                ret = 0;
        }
        rtnl_unlock();
        return ret;
 }
 
+/*
+ * get a list of this system's interface IPv4 addresses, netmasks and MTUs
+ * - maxbufs must be at least 1
+ * - returns the number of interface records in the buffer
+ */
 int afs_get_ipv4_interfaces(struct afs_interface *bufs, size_t maxbufs,
                            bool wantloopback)
 {
@@ -32,21 +44,23 @@ int afs_get_ipv4_interfaces(struct afs_interface *bufs, size_t maxbufs,
        struct in_device *idev;
        int n = 0;
 
+       ASSERT(maxbufs > 0);
+
        rtnl_lock();
-       for (dev = dev_base; dev; dev = dev->next) {
+       for_each_netdev(&init_net, dev) {
                if (dev->type == ARPHRD_LOOPBACK && !wantloopback)
                        continue;
                idev = __in_dev_get_rtnl(dev);
                if (!idev)
                        continue;
                for_primary_ifa(idev) {
-                       if (n == maxbufs)
-                               goto out;
                        bufs[n].address.s_addr = ifa->ifa_address;
                        bufs[n].netmask.s_addr = ifa->ifa_mask;
                        bufs[n].mtu = dev->mtu;
                        n++;
-               } endfor_ifa(idev)
+                       if (n >= maxbufs)
+                               goto out;
+               } endfor_ifa(idev);
        }
 out:
        rtnl_unlock();