diff options
| author | David S. Miller <davem@davemloft.net> | 2014-11-14 07:01:12 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-11-14 07:01:12 +0100 |
| commit | 076ce4482569ea1a2c27b4ca71a309adaf91d398 (patch) | |
| tree | 2ae9e42612f35be897f190983fc292d7af781cd2 /drivers/md/persistent-data/dm-btree-spine.c | |
| parent | tcp: limit GSO packets to half cwnd (diff) | |
| parent | Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost (diff) | |
| download | linux-076ce4482569ea1a2c27b4ca71a309adaf91d398.tar.xz linux-076ce4482569ea1a2c27b4ca71a309adaf91d398.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/chelsio/cxgb4vf/sge.c
drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c
sge.c was overlapping two changes, one to use the new
__dev_alloc_page() in net-next, and one to use s->fl_pg_order in net.
ixgbe_phy.c was a set of overlapping whitespace changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/md/persistent-data/dm-btree-spine.c')
| -rw-r--r-- | drivers/md/persistent-data/dm-btree-spine.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/md/persistent-data/dm-btree-spine.c b/drivers/md/persistent-data/dm-btree-spine.c index cf9fd676ae44..1b5e13ec7f96 100644 --- a/drivers/md/persistent-data/dm-btree-spine.c +++ b/drivers/md/persistent-data/dm-btree-spine.c @@ -92,7 +92,7 @@ struct dm_block_validator btree_node_validator = { /*----------------------------------------------------------------*/ -static int bn_read_lock(struct dm_btree_info *info, dm_block_t b, +int bn_read_lock(struct dm_btree_info *info, dm_block_t b, struct dm_block **result) { return dm_tm_read_lock(info->tm, b, &btree_node_validator, result); |