Brian Behlendorf
0c11631b02
Fix for fix-stack-dmu_objset_snapshot should be 'sn' not '&sn'
...
I missed a instanse of removing the & operator when reducing the
stack usage in this function. This unfortunately doesn't cause
a compile warning but it is does cause ztest failures. Anyway,
update the topic branch to correct this mistake.
2010-06-28 10:06:29 -07:00
Brian Behlendorf
4a1a3825a7
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2010-06-21 22:01:59 -07:00
Brian Behlendorf
e780aad257
Merge branch 'linux-debug-zerocopy' into refs/top-bases/linux-zfs-branch
2010-06-21 22:01:57 -07:00
Brian Behlendorf
06376e3a0e
Revert linux-debug-zerocopy real ZC support added
2010-06-21 21:39:06 -07:00
Brian Behlendorf
d5e4063149
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2010-06-16 14:46:12 -07:00
Brian Behlendorf
53e9660c56
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2010-06-16 14:45:03 -07:00
Brian Behlendorf
5cac48ae66
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-06-16 14:45:02 -07:00
Brian Behlendorf
5a46abc9a0
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-06-16 14:44:50 -07:00
Brian Behlendorf
18ead3a526
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
2010-06-16 14:44:43 -07:00
Brian Behlendorf
67c6255292
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-06-16 14:44:05 -07:00
Brian Behlendorf
76ad38b271
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-06-16 14:43:43 -07:00
Brian Behlendorf
4aba89bb16
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-06-16 14:43:35 -07:00
Brian Behlendorf
4af4558675
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-06-16 14:43:26 -07:00
Brian Behlendorf
8645a8e901
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-06-16 14:43:21 -07:00
Brian Behlendorf
2f457b7bd0
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-06-16 14:43:17 -07:00
Brian Behlendorf
8de2671680
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2010-06-16 14:43:17 -07:00
Brian Behlendorf
6504afae4a
Merge branch 'fix-stack-dmu_objset_snapshot' into refs/top-bases/fix-branch
2010-06-16 14:39:41 -07:00
Brian Behlendorf
e163b08ba3
Add fix-stack-dmu_objset_snapshot topic branch
...
Reduce stack usage by 276 bytes by moving the snaparg struct from the
stack to the heap. We have limited stack space we must not waste.
2010-06-16 14:39:06 -07:00
Brian Behlendorf
a2ba5b83f8
Merge branch 'fix-stack-noinline' into refs/top-bases/fix-branch
2010-06-16 14:35:14 -07:00
Brian Behlendorf
bbdb8184ec
Add fix-stack-noinline topic branch
...
Certain function must never be automatically inlined by gcc because
they are stack heavy or called recursively. This patch flags all
such functions I have found as 'noinline' to prevent gcc from making
the optimization.
2010-06-16 14:34:41 -07:00
Brian Behlendorf
2b857bec4e
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2010-06-16 14:29:50 -07:00
Brian Behlendorf
f956c97dc3
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2010-06-16 14:29:17 -07:00
Brian Behlendorf
f83c9f790e
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-06-16 14:29:16 -07:00
Brian Behlendorf
9513d614a5
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-06-16 14:29:05 -07:00
Brian Behlendorf
29df979686
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
2010-06-16 14:28:57 -07:00
Brian Behlendorf
d30e62105f
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-06-16 14:28:19 -07:00
Brian Behlendorf
17edc470ca
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-06-16 14:27:56 -07:00
Brian Behlendorf
850510ee8f
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-06-16 14:27:48 -07:00
Brian Behlendorf
b76cabbeaf
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-06-16 14:27:40 -07:00
Brian Behlendorf
76f112175f
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-06-16 14:27:35 -07:00
Brian Behlendorf
48ca6d3590
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-06-16 14:27:31 -07:00
Brian Behlendorf
7f979b27f4
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2010-06-16 14:27:30 -07:00
Brian Behlendorf
30c03a0914
Merge branch 'fix-stack' into refs/top-bases/fix-branch
2010-06-16 14:27:29 -07:00
Brian Behlendorf
2115c30515
Revert fix-stack topic branch
...
This patch will be broken in to several independent stack reductions
and reapplied as new topic branches.
2010-06-16 14:23:31 -07:00
Brian Behlendorf
b52eb866bc
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2010-06-16 13:55:21 -07:00
Brian Behlendorf
e536586568
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2010-06-16 13:54:49 -07:00
Brian Behlendorf
37dfa2ca00
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-06-16 13:54:48 -07:00
Brian Behlendorf
16dd4c6bb3
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-06-16 13:54:37 -07:00
Brian Behlendorf
56b4546e2c
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
2010-06-16 13:54:30 -07:00
Brian Behlendorf
38f71c17a7
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-06-16 13:53:55 -07:00
Brian Behlendorf
9cebf85651
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-06-16 13:53:32 -07:00
Brian Behlendorf
2084051282
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-06-16 13:53:24 -07:00
Brian Behlendorf
2f10c62c32
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-06-16 13:53:16 -07:00
Brian Behlendorf
9ba17b0b96
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-06-16 13:53:11 -07:00
Brian Behlendorf
aacc00b961
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-06-16 13:53:08 -07:00
Brian Behlendorf
6a19e49908
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2010-06-16 13:53:07 -07:00
Brian Behlendorf
256505afb0
Merge branch 'fix-stack-dsl_deleg_get' into refs/top-bases/fix-branch
2010-06-16 13:49:55 -07:00
Brian Behlendorf
869764f64d
Add fix-stack-dsl_deleg_get topic branch
...
Reduce stack usage in dsl_deleg_get, gcc flagged it as consuming a
whopping 1040 bytes or potentially 1/4 of a 4K stack. This patch
moves all the large structures and buffer off the stack and on to
the heap. This includes 2 zap_cursor_t structs each 52 bytes in
size, 2 zap_attribute_t structs each 280 bytes in size, and 1
256 byte char array. The total saves on the stack is 880 bytes
after you account for the 5 new pointers added.
Also the source buffer length has been increased from MAXNAMELEN
to MAXNAMELEN+strlen(MOS_DIR_NAME)+1 as described by the comment in
dsl_dir_name(). A buffer overrun may have been possible with the
slightly smaller buffer.
2010-06-16 13:49:25 -07:00
Brian Behlendorf
72421ee377
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2010-06-16 12:46:52 -07:00
Brian Behlendorf
b855fb237f
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2010-06-16 12:46:20 -07:00
Brian Behlendorf
fbe96f9ab0
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-06-16 12:46:19 -07:00
Brian Behlendorf
d30efbdef2
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-06-16 12:46:08 -07:00
Brian Behlendorf
d67b0bd380
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
2010-06-16 12:46:01 -07:00
Brian Behlendorf
0c636b03c0
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-06-16 12:45:25 -07:00
Brian Behlendorf
5204c79855
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-06-16 12:45:03 -07:00
Brian Behlendorf
08415a34fb
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-06-16 12:44:53 -07:00
Brian Behlendorf
63bf34ba31
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-06-16 12:44:19 -07:00
Brian Behlendorf
9e35aaedba
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-06-16 12:44:13 -07:00
Brian Behlendorf
4738ecfcdc
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-06-16 12:44:09 -07:00
Brian Behlendorf
1ccdbb250b
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2010-06-16 12:44:08 -07:00
Brian Behlendorf
31cc6992c5
Merge branch 'fix-stack-dsl_dir_open_spa' into refs/top-bases/fix-branch
2010-06-16 12:40:39 -07:00
Brian Behlendorf
0c524122bd
Add fix-stack-dsl_dir_open_spa topic branch
...
Reduce stack usage by 256 bytes by moving buf char array from
the stack to the heap.
2010-06-16 12:39:44 -07:00
Brian Behlendorf
7fcc233b9c
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2010-06-16 12:21:18 -07:00
Brian Behlendorf
4149705c8c
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2010-06-16 12:18:57 -07:00
Brian Behlendorf
d303d824d6
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-06-16 12:18:56 -07:00
Brian Behlendorf
64b81f7c25
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-06-16 12:17:51 -07:00
Brian Behlendorf
7354ad589b
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
2010-06-16 12:17:18 -07:00
Brian Behlendorf
87af8ae76b
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-06-16 12:14:37 -07:00
Brian Behlendorf
ed15c80b39
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-06-16 12:13:00 -07:00
Brian Behlendorf
70b7065e93
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-06-16 12:12:28 -07:00
Brian Behlendorf
0de95c796f
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-06-16 12:11:55 -07:00
Brian Behlendorf
b8ece25717
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-06-16 12:11:25 -07:00
Brian Behlendorf
9fd12ce4fd
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-06-16 12:11:21 -07:00
Brian Behlendorf
2b71569742
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2010-06-16 12:11:20 -07:00
Brian Behlendorf
877a37d8bd
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
2010-06-16 12:11:18 -07:00
Brian Behlendorf
8a001d8f59
Extra uninit vars flagged by gcc 4.1.2
...
Newer versions of the compiler are OK with this but for the sake of
older compilers explicitly initialize them.
2010-06-16 11:45:07 -07:00
Brian Behlendorf
f57c0267cf
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2010-06-16 10:39:00 -07:00
Brian Behlendorf
916ff9bb97
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
2010-06-16 10:38:58 -07:00
Brian Behlendorf
79577be589
Ensure sys/fm/util.h ia not included
...
Because of events related changes and the need to access zio_cmd_t
we can't unconditionally include sys/fm/util.h as part of zfs_context.h.
2010-06-16 10:34:40 -07:00
Brian Behlendorf
a1f8349461
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2010-06-16 10:01:08 -07:00
Brian Behlendorf
3fe3e41259
Merge branch 'linux-spa-thread' into refs/top-bases/linux-zfs-branch
2010-06-16 10:01:06 -07:00
Brian Behlendorf
6104e13be6
Add linux-spa-thread topic branch
...
Disable the spa thread under Linux until it can be implemented.
2010-06-16 09:59:39 -07:00
Brian Behlendorf
01581d6bc1
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2010-06-16 09:49:08 -07:00
Brian Behlendorf
6fa858c778
Merge branch 'linux-sha2' into refs/top-bases/linux-zfs-branch
2010-06-16 09:49:06 -07:00
Brian Behlendorf
14d073e298
Add linux-sha2 topic branch for portability
...
The upstream ZFS code has correctly moved to a faster native sha2
implementation. Unfortunately, under Linux that's going to be a little
problematic so we revert the code to the more portable version contained
in earlier ZFS releases. Using the native sha2 implementation in Linux
is possible but the API is slightly different in kernel version user
space depending on which libraries are used. Ideally, we need a fast
implementation of SHA256 which builds as part of ZFS this shouldn't be
that hard to do but it will take some effort.
2010-06-16 09:47:25 -07:00
Brian Behlendorf
6daad878a7
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2010-06-14 17:00:55 -07:00
Brian Behlendorf
e8e324e048
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2010-06-14 17:00:43 -07:00
Brian Behlendorf
5de3a200c4
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-06-14 17:00:42 -07:00
Brian Behlendorf
55b02e4ca6
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-06-14 17:00:29 -07:00
Brian Behlendorf
bfdcbd7014
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
2010-06-14 17:00:21 -07:00
Brian Behlendorf
f224397b56
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-06-14 16:59:40 -07:00
Brian Behlendorf
09abb3e8ae
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-06-14 16:59:15 -07:00
Brian Behlendorf
2d15a98cb9
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
...
Conflicts:
module/zfs/include/sys/dmu.h
2010-06-14 16:59:02 -07:00
Brian Behlendorf
5edd772c8c
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-06-14 16:58:06 -07:00
Brian Behlendorf
0f3a1ce26e
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
...
Conflicts:
module/zfs/include/sys/dmu.h
2010-06-14 16:57:03 -07:00
Brian Behlendorf
b41c7ff877
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-06-14 16:45:47 -07:00
Brian Behlendorf
7f181ac166
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2010-06-14 16:45:46 -07:00
Brian Behlendorf
2f30cc0188
Merge branch 'fix-stack-lzjb' into refs/top-bases/fix-branch
2010-06-14 16:45:33 -07:00
Brian Behlendorf
b8cc785fb6
Add fix-stack-lzjb topic branch
...
Reduce kernel stack usage by lzjb_compress() by moving uint16 array
off the stack and on to the heap. The exact performance implications
of this I have not measured but we absolutely need to keep stack
usage to a minimum. If/when this becomes and issue we optimize.
2010-06-14 16:45:01 -07:00
Brian Behlendorf
51322821f3
Merge branch 'fix-kstat-xuio' into refs/top-bases/fix-branch
2010-06-14 16:43:32 -07:00
Brian Behlendorf
f61a7ce9e1
Add fix-kstat-xuio topic branch
...
Move xiou stat structures from a header to the dmu.c source as is
done with all the other kstat interfaces. This information is local
to dmu.c registered the xuio kstat and should stay that way.
2010-06-14 16:43:01 -07:00
Brian Behlendorf
963518b20f
Merge branch 'fix-metaslab' into refs/top-bases/fix-branch
2010-06-14 16:40:45 -07:00
Brian Behlendorf
f3a61f709d
Add fix-metaslab topic branch
...
If your only going to allow one allocator to be used and it is defined
at compile time there is no point including the others in the build.
This patch could/should be refined for Linux to make the metaslab
configurable at run time. That might be a bit tricky however since
you would need to quiese all IO. Short of that making it configurable
as a module load option would be a reasonable compromise.
2010-06-14 16:40:26 -07:00
Brian Behlendorf
f3f44cbd31
Merge branch 'fix-current' into refs/top-bases/fix-branch
2010-06-14 16:39:27 -07:00
Brian Behlendorf
6cf7f7c9df
Add fix-current topic branch
...
In the linux kernel 'current' is defined to mean the current process
and can never be used as a local variable in a function. Simply
replace all usage of 'current' with 'curr' in this function.
2010-06-14 16:38:56 -07:00
Brian Behlendorf
1052e0ca93
Resolve merge conflict
2010-06-14 16:35:30 -07:00
Brian Behlendorf
b2b1bb3915
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2010-06-14 16:29:38 -07:00
Brian Behlendorf
1cf89258c3
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-06-14 16:29:37 -07:00
Brian Behlendorf
832eb9444f
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-06-14 16:29:25 -07:00
Brian Behlendorf
4dfa80d6c8
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
2010-06-14 16:29:16 -07:00
Brian Behlendorf
a1a41b3235
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-06-14 16:28:36 -07:00
Brian Behlendorf
67e6c9469a
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-06-14 16:28:12 -07:00
Brian Behlendorf
ed3fb30284
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-06-14 16:28:04 -07:00
Brian Behlendorf
040a350328
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-06-14 16:27:55 -07:00
Brian Behlendorf
1aeae83705
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-06-14 16:27:50 -07:00
Brian Behlendorf
08060ef853
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-06-14 16:25:02 -07:00
Brian Behlendorf
eb894076a4
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
...
Conflicts:
cmd/ztest/ztest.c
2010-06-14 16:24:45 -07:00
Brian Behlendorf
bce1904fbb
Merge branch 'fix-taskq' into refs/top-bases/fix-branch
2010-06-14 16:21:59 -07:00
Brian Behlendorf
49ad53c46f
Update fix-taskq to never sleep at interrupt time
...
Updated fix to detect if we are in an interrupt and only sleep if it
is safe to do some. I guess it must be safe to sleep under Solaris
this must be handled in a sort interrupt handler there
2010-06-14 16:14:23 -07:00
Brian Behlendorf
3731ec7cf5
Merge branch 'linux-debug-zerocopy' into refs/top-bases/linux-zfs-branch
2010-06-14 16:11:05 -07:00
Brian Behlendorf
9974b54060
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2010-06-14 16:11:02 -07:00
Brian Behlendorf
6348afcb98
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
2010-06-14 16:10:57 -07:00
Brian Behlendorf
f2229fe24d
Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch
2010-06-14 16:10:55 -07:00
Brian Behlendorf
9193fdea7e
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-06-14 16:10:54 -07:00
Brian Behlendorf
6eac28ff79
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-06-14 16:10:53 -07:00
Brian Behlendorf
96095c3a17
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-06-14 16:10:51 -07:00
Brian Behlendorf
e7e0311ce4
Update linux-kernel-mem
...
Additional minor memory related tweak to move certain large allocations
to virtual memory and in one case to simply suppress the warning message
since it is not that far over the warning limit.
2010-06-14 16:08:15 -07:00
Brian Behlendorf
67e8f48f1b
Update linux-kernel-device to handle ioc changes
...
Upstream they modified the ioctl code so we need to make similiar
updates since we modify the API ourselves to always pass a pointer
to file pointer around. This allows us to track per file handle
state which is used by the zevent code.
2010-06-14 16:04:00 -07:00
Brian Behlendorf
302238d84f
Update linux-user-disk
...
Minor updates to handle changes in the user side of ZFS, utils and such.
2010-06-14 16:03:02 -07:00
Brian Behlendorf
800b7a03e1
Update linux-kernel-disk ZVOL implementation
...
The ZVOL interfaces changed significantly with the latest update. I've
updated the Linux version of the code to handle this and it looks like
the net result has been a simpler implementation which is good! Plus,
I'm relatively sure the ZIL integration is right this time although it
needs some serious crash testing to verify that.
Also minor additions to vdev_disk for .hold and .rele callbacks.
Currently, they do nothing and I may be able to simply stub them out
with NULLs for Linux since opening the device in Linux should have
much the same effort. More investigation is needed though since
the ZFS interface may make some demands here I'm overlooking.
2010-06-14 16:02:03 -07:00
Brian Behlendorf
e92d6d861f
Update linux-kernel-module with refreshed EXPORT_SYMBOLs
...
After such a large update many of the symbols which were previously
exported are no longer available, and several new symbols have been
added and are needed. Refresh to topic branch to reflect this.
2010-06-14 15:58:15 -07:00
Brian Behlendorf
3a0400ad88
Update linux-events
...
Minor updates to linux-events to handle some upstream changes. Luckily,
this was done flexibly enough the first time it wasn't much of a problem.
2010-06-14 15:57:09 -07:00
Brian Behlendorf
760c0c3629
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2010-06-14 15:53:44 -07:00
Brian Behlendorf
24d1a8e0ed
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-06-14 15:53:43 -07:00
Brian Behlendorf
f9e717f642
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-06-14 15:53:31 -07:00
Brian Behlendorf
101243ff1d
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
2010-06-14 15:53:24 -07:00
Brian Behlendorf
84f16a207f
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-06-14 15:52:45 -07:00
Brian Behlendorf
3877ce40fa
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-06-14 15:52:43 -07:00
Brian Behlendorf
edb4ee024f
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-06-14 15:52:19 -07:00
Brian Behlendorf
2a00f10bf8
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-06-14 15:52:11 -07:00
Brian Behlendorf
66f323c624
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-06-14 15:52:02 -07:00
Brian Behlendorf
fb35fe3bc1
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-06-14 15:51:56 -07:00
Brian Behlendorf
06b5dc883f
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-06-14 15:51:52 -07:00
Brian Behlendorf
953aa00176
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2010-06-14 15:51:51 -07:00
Brian Behlendorf
5fa2cb516b
Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch
2010-06-14 15:51:50 -07:00
Brian Behlendorf
21690470e3
Update linux-zpios to use updated DMU API
...
The DMU API has been modified to remove the dmu_objset_open, and
dmu_objset_close functions. Now you must explicitly *_create an
objset, then *_own it, *_disown it when not in use, and *_destroy
it when your through. All and all I like the API much better.
Additionally, while I was here I moved the zpios_cmd_t off the
stack because previous analysis showed it was very stack heavy.
2010-06-14 15:48:55 -07:00
Brian Behlendorf
c430e23552
Update zfs-branch with build system updates
...
Required Makefile modifications for updated ZFS code.
2010-06-14 15:46:11 -07:00
Brian Behlendorf
696ec7fb61
Update gcc-missing-braces based on structure changes
...
Almost exclusively this patch handled the addition of another char
array to the zfs_cmd_t structure. Unfortunately c90 doesn't allow
zero filling the entire struct with the '= { 0 };' shorthand.
2010-06-14 15:44:06 -07:00
Brian Behlendorf
9953f52bec
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2010-06-14 15:39:05 -07:00
Brian Behlendorf
12fac2aa2c
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-06-14 15:39:03 -07:00