Hi Jens,
Today's linux-next merge of the block tree got a conflict in fs/bio.c
between commit 0bfc24559d7945506184d86739fe365a181f06b7 ("blktrace: port
to tracepoints, update") from the ftrace tree and commit
18e08407d87bed3a9c4205e53bb16fe36088a521 ("bio: allow individual slabs in
the bio_set") from the block tree.
Just an overlapping addition/removal. I fixed it up (see below) and can
carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
diff --cc fs/bio.c
index df99c88,3bd633d..0000000
--- a/fs/bio.c
+++ b/fs/bio.c
@@@ -26,12 -26,13 +26,16 @@@
#include <linux/mempool.h>
#include <linux/workqueue.h>
#include <linux/blktrace_api.h>
+#include <trace/block.h>
#include <scsi/sg.h> /* for struct sg_iovec */
+DEFINE_TRACE(block_split);
+
- static struct kmem_cache *bio_slab __read_mostly;
+ /*
+ * Test patch to inline a certain number of bi_io_vec's inside the bio
+ * itself, to shrink a bio data allocation from two mempool calls to one
+ */
+ #define BIO_INLINE_VECS 4
static mempool_t *bio_split_pool __read_mostly;
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
