projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[deliverable/linux.git]
/
drivers
/
block
/
aoe
/
aoecmd.c
diff --git
a/drivers/block/aoe/aoecmd.c
b/drivers/block/aoe/aoecmd.c
index 01fbdd38e3be21979027538b64b5cd56dc516f0c..99672017ca56f5212229db8fb9312e7c81842e7b 100644
(file)
--- a/
drivers/block/aoe/aoecmd.c
+++ b/
drivers/block/aoe/aoecmd.c
@@
-9,6
+9,7
@@
#include <linux/skbuff.h>
#include <linux/netdevice.h>
#include <linux/genhd.h>
#include <linux/skbuff.h>
#include <linux/netdevice.h>
#include <linux/genhd.h>
+#include <net/net_namespace.h>
#include <asm/unaligned.h>
#include "aoe.h"
#include <asm/unaligned.h>
#include "aoe.h"
@@
-194,7
+195,7
@@
aoecmd_cfg_pkts(ushort aoemajor, unsigned char aoeminor, struct sk_buff **tail)
sl = sl_tail = NULL;
read_lock(&dev_base_lock);
sl = sl_tail = NULL;
read_lock(&dev_base_lock);
- for_each_netdev(ifp) {
+ for_each_netdev(
&init_net,
ifp) {
dev_hold(ifp);
if (!is_aoe_netif(ifp))
goto cont;
dev_hold(ifp);
if (!is_aoe_netif(ifp))
goto cont;
@@
-652,7
+653,7
@@
aoecmd_ata_rsp(struct sk_buff *skb)
disk_stat_add(disk, sectors[rw], n_sect);
disk_stat_add(disk, io_ticks, duration);
n = (buf->flags & BUFFL_FAIL) ? -EIO : 0;
disk_stat_add(disk, sectors[rw], n_sect);
disk_stat_add(disk, io_ticks, duration);
n = (buf->flags & BUFFL_FAIL) ? -EIO : 0;
- bio_endio(buf->bio,
buf->bio->bi_size,
n);
+ bio_endio(buf->bio, n);
mempool_free(buf, d->bufpool);
}
}
mempool_free(buf, d->bufpool);
}
}
This page took
0.030871 seconds
and
5
git commands to generate.