Brian Behlendorf
a221019e82
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-05-20 17:17:42 -07:00
Brian Behlendorf
cdd590f8b9
Recreate volume and snapshot /dev links during module load.
...
Links in /dev for volumes/snapshots were only being created
at volume/snapshot creation time. Those links are now also
created dynamically at module load time based on the spa config.
In other words all you need to do to get access to your zfs
datasets after a reboot is load the module. It's magic!
2010-05-20 16:59:02 -07:00
Brian Behlendorf
c8d574777d
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-05-20 14:51:13 -07:00
Brian Behlendorf
fe3cca82ae
Support KM_NODEBUG kmem flag.
...
It turns out the zil allocates quite large buffers. This isn't
all the surprising but we need to suppress the warnings until
it's clear what to do about it.
2010-05-20 14:35:02 -07:00
Brian Behlendorf
7b86766ab9
Merge branch 'linux-debug-zerocopy' into refs/top-bases/linux-zfs-branch
2010-05-20 10:29:52 -07:00
Brian Behlendorf
312e95b093
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2010-05-20 10:29:50 -07:00
Brian Behlendorf
6a740514a9
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-05-20 10:29:49 -07:00
Brian Behlendorf
822d7a066e
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
2010-05-20 10:29:04 -07:00
Brian Behlendorf
0d2b12f8aa
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-05-20 10:29:02 -07:00
Brian Behlendorf
386fbea62a
Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch
2010-05-20 10:28:39 -07:00
Brian Behlendorf
d60a534881
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
2010-05-20 10:28:37 -07:00
Brian Behlendorf
09dcf4870d
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2010-05-20 10:28:14 -07:00
Brian Behlendorf
093ac1d081
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2010-05-20 10:28:12 -07:00
Brian Behlendorf
83879ba568
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2010-05-20 10:27:50 -07:00
Brian Behlendorf
391f4e0072
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-05-20 10:27:48 -07:00
Brian Behlendorf
dcf475661d
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2010-05-20 10:27:25 -07:00
Brian Behlendorf
3cafd278a9
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2010-05-20 10:27:23 -07:00
Brian Behlendorf
d9e1a60854
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-05-20 10:27:00 -07:00
Brian Behlendorf
2312b75f9a
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-05-20 10:26:58 -07:00
Brian Behlendorf
2134721e6e
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-05-20 10:26:35 -07:00
Brian Behlendorf
46fb31d60c
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-05-20 10:26:33 -07:00
Brian Behlendorf
19035d1734
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-05-20 10:26:10 -07:00
Brian Behlendorf
84506949ec
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-05-20 10:26:08 -07:00
Brian Behlendorf
d04b8e9fa2
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2010-05-20 10:25:45 -07:00
Brian Behlendorf
3a9c2a23b7
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-05-20 10:25:43 -07:00
Brian Behlendorf
c7068a5d76
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-05-20 10:25:20 -07:00
Brian Behlendorf
588a449812
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-05-20 10:25:18 -07:00
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
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