448fd0d3b5
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-08-12 15:23:30 -07:00
3c375170f3
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-08-12 15:23:28 -07:00
ca4ab74006
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2010-08-12 15:23:22 -07:00
cc5f8ceccf
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-08-12 15:23:19 -07:00
9df7de4475
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-08-12 15:23:13 -07:00
16feb71598
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-08-12 15:23:11 -07:00
8cc3da98d0
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-08-12 15:23:10 -07:00
baac50219c
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2010-08-12 15:23:10 -07:00
644830d967
Merge commit 'refs/top-bases/fix-branch' into fix-branch
2010-08-12 15:23:09 -07:00
6821ba2bbc
Merge branch 'fix-taskq' into refs/top-bases/fix-branch
2010-08-12 15:23:08 -07:00
49177b6ab7
Use inline version of __zio_execute
...
Explicitly call to inline version to minimize stack usage.
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
2010-08-12 15:18:43 -07:00
54e72b511a
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-08-11 11:15:08 -07:00
0d95a031bc
Use vmem_alloc() for 128K allocation
...
The mzap_update() function allocates enough memory for a full
dbuf which can be 128K in size. Ideally, this memory should
be allocated from our slab but in the short term it's simplest
just to vmem_alloc() the memory instead.
Closes #48
2010-08-11 11:09:33 -07:00
2e9ec24013
Merge branch 'linux-have-mlslabel' into refs/top-bases/linux-zfs-branch
2010-08-10 11:08:56 -07:00
3a79d7b5fb
Merge commit 'refs/top-bases/linux-have-mlslabel' into linux-have-mlslabel
2010-08-10 11:08:54 -07:00
534cbf8e97
Merge branch 'linux-spa-thread' into refs/top-bases/linux-zfs-branch
2010-08-10 11:08:46 -07:00
064ae5f454
Merge commit 'refs/top-bases/linux-spa-thread' into linux-spa-thread
2010-08-10 11:08:44 -07:00
b9f04b8739
Merge branch 'linux-topology' into refs/top-bases/linux-zfs-branch
2010-08-10 11:08:37 -07:00
979b643baf
Merge commit 'refs/top-bases/linux-topology' into linux-topology
2010-08-10 11:08:35 -07:00
8426b17c18
Merge branch 'linux-sha2' into refs/top-bases/linux-zfs-branch
2010-08-10 11:08:27 -07:00
5c53d8becc
Merge commit 'refs/top-bases/linux-sha2' into linux-sha2
2010-08-10 11:08:25 -07:00
7f31b3cb97
Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch
2010-08-10 11:08:18 -07:00
de95ce99e7
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
2010-08-10 11:08:15 -07:00
e5fee495b9
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
2010-08-10 11:08:08 -07:00
504a08d313
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-08-10 11:08:06 -07:00
d5bfff09ee
Merge branch 'linux-kernel-module' into refs/top-bases/linux-zfs-branch
2010-08-10 11:07:59 -07:00
1b8e0b33a7
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-08-10 11:07:57 -07:00
eab540ea26
Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch
2010-08-10 11:07:49 -07:00
4c0f12db73
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
2010-08-10 11:07:47 -07:00
18e7f7f3f9
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2010-08-10 11:07:39 -07:00
ad7be70d72
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2010-08-10 11:07:36 -07:00
6a08b2f106
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2010-08-10 11:07:28 -07:00
d4954873ef
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-08-10 11:07:25 -07:00
2449408072
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2010-08-10 11:07:18 -07:00
3e384beacf
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2010-08-10 11:07:14 -07:00
74dec5fb7c
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-08-10 11:07:06 -07:00
0aeb04b011
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-08-10 11:07:04 -07:00
648dd21acf
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-08-10 11:06:55 -07:00
0013b03b62
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-08-10 11:06:53 -07:00
17791344b0
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-08-10 11:06:44 -07:00
a3a4874ef1
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-08-10 11:06:41 -07:00
d1ed264ae9
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2010-08-10 11:06:33 -07:00
9e3d6dee32
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-08-10 11:06:31 -07:00
1ac4e5bfc4
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-08-10 11:06:23 -07:00
ebc64a43c3
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-08-10 11:06:21 -07:00
a2e6ae2bda
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-08-10 11:06:13 -07:00
82d26b1027
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-08-10 11:06:11 -07:00
5f466baab9
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2010-08-10 11:06:04 -07:00
6b655f7852
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-08-10 11:06:02 -07:00
299cc480da
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-08-10 11:05:54 -07:00
Brian Behlendorf
Ned Bass