63aef3adba
Merge branch 'linux-spa-thread' into refs/top-bases/linux-zfs-branch
2010-08-12 15:25:26 -07:00
411f33af33
Merge commit 'refs/top-bases/linux-spa-thread' into linux-spa-thread
2010-08-12 15:25:24 -07:00
9694fd2f8c
Merge branch 'linux-topology' into refs/top-bases/linux-zfs-branch
2010-08-12 15:25:19 -07:00
f06cae9560
Merge commit 'refs/top-bases/linux-topology' into linux-topology
2010-08-12 15:25:17 -07:00
9a464d4486
Merge branch 'linux-sha2' into refs/top-bases/linux-zfs-branch
2010-08-12 15:25:11 -07:00
b8bc4c2cf6
Merge commit 'refs/top-bases/linux-sha2' into linux-sha2
2010-08-12 15:25:09 -07:00
b00685b410
Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch
2010-08-12 15:25:03 -07:00
055cf7ff30
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
2010-08-12 15:25:01 -07:00
731e541e70
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
2010-08-12 15:24:56 -07:00
296f0a8cb9
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-08-12 15:24:54 -07:00
11b828c51d
Merge branch 'linux-kernel-module' into refs/top-bases/linux-zfs-branch
2010-08-12 15:24:48 -07:00
b4f9d430e5
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-08-12 15:24:46 -07:00
4dd57c5dd4
Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch
2010-08-12 15:24:40 -07:00
02cb279a1f
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
2010-08-12 15:24:38 -07:00
40fb00e561
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2010-08-12 15:24:33 -07:00
66804a7e71
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2010-08-12 15:24:30 -07:00
a43b705567
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2010-08-12 15:24:25 -07:00
3c501de6b6
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-08-12 15:24:23 -07:00
661e6fd39d
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2010-08-12 15:24:17 -07:00
6e52879ce7
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2010-08-12 15:24:15 -07:00
0d73c1d7fa
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-08-12 15:24:09 -07:00
41cdefaec2
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-08-12 15:24:07 -07:00
73cebd0763
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-08-12 15:24:02 -07:00
67e828de43
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-08-12 15:23:59 -07:00
d07fd603e1
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-08-12 15:23:54 -07:00
0cb77d992d
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-08-12 15:23:51 -07:00
0125eb04c0
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2010-08-12 15:23:45 -07:00
b181316619
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-08-12 15:23:43 -07:00
19f98e4927
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-08-12 15:23:38 -07:00
4c38d8822e
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-08-12 15:23:36 -07:00
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
260f8400e8
Skip floppy device when probing /dev/
...
When probing /dev/ for validing ZFS devices to import skip floppy
block devices. There's no reason to waste time checking these
devices even though they are valid block devices. Plus, we had
one system get stuck on I/O errors probing the device.
end_request: I/O error, dev fd0, sector 0
Buffer I/O error on device fd0p120, logical block 0
end_request: I/O error, dev fd0, sector 8
Buffer I/O error on device fd0p120, logical block 1
2010-08-12 15:19:00 -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
Brian Behlendorf
Ned Bass