Brian Behlendorf
36ac8a77d5
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-05-20 10:24:54 -07:00
Brian Behlendorf
da41056e9b
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-05-20 10:24:52 -07:00
Brian Behlendorf
f935d72383
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2010-05-20 10:24:29 -07:00
Brian Behlendorf
2f5167889f
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-05-20 10:24:27 -07:00
Brian Behlendorf
c6ea865e3a
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-05-20 10:24:05 -07:00
Brian Behlendorf
3e49f384a3
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-05-20 10:24:02 -07:00
Brian Behlendorf
4ae64a8acd
Move from kmem_alloc() to vmem_alloc().
...
These two allocations are 16k in size which trips the SPL warning
about large kmem_allocs(). For now simply shift them to a vmem_alloc().
Yes, this has it's own set of problems but this happens infrequently
enough not to be a real issue. But more importantly it means that
we've flagged this place in the code via this topic branch as a
place which still needs long term work.
2010-05-20 10:06:32 -07:00
Brian Behlendorf
b50494ba2d
Add missing header observed after linux-legacy was reverted.
...
Interestingly this has only been a problem on a clean RHEL6
install so I suspect the include was removed from one of the
standard system include headers. We should be including it
explicitly anyway since it's used in both of these .c files.
2010-05-20 10:04:10 -07:00
Brian Behlendorf
b974e4bf4d
Fix error message to reference the new libuuid package.
...
It used to be the case that libuuid was part of e2fsprogs. However,
since other projects unrelated to e2fsprogs make use of that library
it was getting aukward to have that dependency. The package was
split from e2fsprogs and moved to its own devel package in the
util-linux-ng project. Anyway, I'm just updating the error message
to reflect the new upstream reality.
2010-05-20 10:00:03 -07:00
Brian Behlendorf
77e6902e54
Merge commit 'refs/top-bases/top' into top
2010-05-18 16:24:58 -07:00
Brian Behlendorf
233c86a30a
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2010-05-18 16:24:57 -07:00
Brian Behlendorf
4e17ee1040
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2010-05-18 16:24:56 -07:00
Brian Behlendorf
9929ffdec4
Merge branch 'linux-debug-zerocopy' into refs/top-bases/linux-zfs-branch
2010-05-18 16:24:55 -07:00
Brian Behlendorf
d5941b4c3d
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2010-05-18 16:24:53 -07:00
Brian Behlendorf
f02ff65e3f
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-05-18 16:24:53 -07:00
Brian Behlendorf
16353c430c
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
2010-05-18 16:24:39 -07:00
Brian Behlendorf
0ffb7b7f40
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-05-18 16:24:37 -07:00
Brian Behlendorf
925daf0aa0
Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch
2010-05-18 16:24:29 -07:00
Brian Behlendorf
2542a0e437
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
2010-05-18 16:24:27 -07:00
Brian Behlendorf
21c8a76e8f
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2010-05-18 16:24:20 -07:00
Brian Behlendorf
408bd6685e
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2010-05-18 16:24:18 -07:00
Brian Behlendorf
c285e30967
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2010-05-18 16:24:11 -07:00
Brian Behlendorf
642009ca1d
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-05-18 16:24:09 -07:00
Brian Behlendorf
b7e3c8dda1
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2010-05-18 16:24:01 -07:00
Brian Behlendorf
dc00ab7bf4
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2010-05-18 16:23:59 -07:00
Brian Behlendorf
14524baddc
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-05-18 16:23:52 -07:00
Brian Behlendorf
470e2e5c70
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-05-18 16:23:50 -07:00
Brian Behlendorf
6ae0735fbe
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-05-18 16:23:42 -07:00
Brian Behlendorf
ad78a7f826
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-05-18 16:23:41 -07:00
Brian Behlendorf
d0fb672d5b
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-05-18 16:23:33 -07:00
Brian Behlendorf
ac21bd7c44
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-05-18 16:23:31 -07:00
Brian Behlendorf
85b46f9020
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2010-05-18 16:23:23 -07:00
Brian Behlendorf
0aa6aae489
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-05-18 16:23:21 -07:00
Brian Behlendorf
c79ca8d2e6
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-05-18 16:23:14 -07:00
Brian Behlendorf
91979ad8ff
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-05-18 16:23:12 -07:00
Brian Behlendorf
3aa78bb832
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-05-18 16:23:04 -07:00
Brian Behlendorf
f091b86fdb
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-05-18 16:23:03 -07:00
Brian Behlendorf
472a2e0114
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2010-05-18 16:22:55 -07:00
Brian Behlendorf
1f47cacf55
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-05-18 16:22:53 -07:00
Brian Behlendorf
437789841d
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-05-18 16:22:46 -07:00
Brian Behlendorf
3300354e08
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-05-18 16:22:44 -07:00
Brian Behlendorf
d28ada9eaa
Remove explicit import from zconfig test 1.
...
Due to now resolved bug in the SPL you would need to explicitly
import you zpools after module load. Now that is no longer the case.
If a cache file is found your pool will be automatically loaded and
available so I'm removing the explicit imports from the test case.
2010-05-18 16:15:57 -07:00
Brian Behlendorf
e19dec32a7
Minor fix from linux-legacy branch.
...
Fold in a minor fix from the removed linux-legacy branch to skip checking
character devices in /dev/ during import. Under Linux pread() may simply
block when reading from these devices causing the import to hang.
2010-05-18 16:13:10 -07:00
Brian Behlendorf
d73ae2c495
Merge commit 'refs/top-bases/top' into top
2010-05-18 15:13:54 -07:00
Brian Behlendorf
d5c0441641
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2010-05-18 15:13:53 -07:00
Brian Behlendorf
f26fd3eab8
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2010-05-18 15:13:51 -07:00
Brian Behlendorf
c287454d78
Merge branch 'linux-debug-zerocopy' into refs/top-bases/linux-zfs-branch
2010-05-18 15:13:51 -07:00
Brian Behlendorf
742562df13
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2010-05-18 15:13:49 -07:00
Brian Behlendorf
f52c20273b
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-05-18 15:13:48 -07:00
Brian Behlendorf
cda88c79cb
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
2010-05-18 15:13:33 -07:00
