4149705c8c
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2010-06-16 12:18:57 -07:00
d303d824d6
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-06-16 12:18:56 -07:00
87af8ae76b
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-06-16 12:14:37 -07:00
ed15c80b39
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-06-16 12:13:00 -07:00
70b7065e93
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-06-16 12:12:28 -07:00
0de95c796f
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-06-16 12:11:55 -07:00
b8ece25717
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-06-16 12:11:25 -07:00
9fd12ce4fd
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-06-16 12:11:21 -07:00
2b71569742
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2010-06-16 12:11:20 -07:00
877a37d8bd
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
2010-06-16 12:11:18 -07:00
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
916ff9bb97
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
2010-06-16 10:38:58 -07:00
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
3fe3e41259
Merge branch 'linux-spa-thread' into refs/top-bases/linux-zfs-branch
2010-06-16 10:01:06 -07:00
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
6fa858c778
Merge branch 'linux-sha2' into refs/top-bases/linux-zfs-branch
2010-06-16 09:49:06 -07:00
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
e8e324e048
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2010-06-14 17:00:43 -07:00
5de3a200c4
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-06-14 17:00:42 -07:00
55b02e4ca6
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-06-14 17:00:29 -07:00
f224397b56
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-06-14 16:59:40 -07:00
09abb3e8ae
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-06-14 16:59:15 -07:00
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
5edd772c8c
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-06-14 16:58:06 -07:00
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
b41c7ff877
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-06-14 16:45:47 -07:00
7f181ac166
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2010-06-14 16:45:46 -07:00
2f30cc0188
Merge branch 'fix-stack-lzjb' into refs/top-bases/fix-branch
2010-06-14 16:45:33 -07:00
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
51322821f3
Merge branch 'fix-kstat-xuio' into refs/top-bases/fix-branch
2010-06-14 16:43:32 -07:00
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
963518b20f
Merge branch 'fix-metaslab' into refs/top-bases/fix-branch
2010-06-14 16:40:45 -07:00
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
f3f44cbd31
Merge branch 'fix-current' into refs/top-bases/fix-branch
2010-06-14 16:39:27 -07:00
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
b2b1bb3915
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2010-06-14 16:29:38 -07:00
1cf89258c3
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-06-14 16:29:37 -07:00
832eb9444f
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-06-14 16:29:25 -07:00
a1a41b3235
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-06-14 16:28:36 -07:00
67e6c9469a
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-06-14 16:28:12 -07:00
ed3fb30284
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-06-14 16:28:04 -07:00
040a350328
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-06-14 16:27:55 -07:00
1aeae83705
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-06-14 16:27:50 -07:00
08060ef853
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-06-14 16:25:02 -07:00
eb894076a4
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
...
Conflicts:
cmd/ztest/ztest.c
2010-06-14 16:24:45 -07:00
bce1904fbb
Merge branch 'fix-taskq' into refs/top-bases/fix-branch
2010-06-14 16:21:59 -07:00
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
3731ec7cf5
Merge branch 'linux-debug-zerocopy' into refs/top-bases/linux-zfs-branch
2010-06-14 16:11:05 -07:00
9974b54060
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2010-06-14 16:11:02 -07:00
6348afcb98
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
2010-06-14 16:10:57 -07:00
f2229fe24d
Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch
2010-06-14 16:10:55 -07:00
9193fdea7e
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-06-14 16:10:54 -07:00
6eac28ff79
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-06-14 16:10:53 -07:00
96095c3a17
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-06-14 16:10:51 -07:00
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
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
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
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
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
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
760c0c3629
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2010-06-14 15:53:44 -07:00
24d1a8e0ed
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-06-14 15:53:43 -07:00
f9e717f642
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-06-14 15:53:31 -07:00
101243ff1d
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
2010-06-14 15:53:24 -07:00
84f16a207f
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-06-14 15:52:45 -07:00
3877ce40fa
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-06-14 15:52:43 -07:00
edb4ee024f
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-06-14 15:52:19 -07:00
2a00f10bf8
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-06-14 15:52:11 -07:00
66f323c624
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-06-14 15:52:02 -07:00
fb35fe3bc1
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-06-14 15:51:56 -07:00
06b5dc883f
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-06-14 15:51:52 -07:00
953aa00176
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2010-06-14 15:51:51 -07:00
5fa2cb516b
Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch
2010-06-14 15:51:50 -07:00
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
c430e23552
Update zfs-branch with build system updates
...
Required Makefile modifications for updated ZFS code.
2010-06-14 15:46:11 -07:00
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
9953f52bec
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2010-06-14 15:39:05 -07:00
12fac2aa2c
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-06-14 15:39:03 -07:00
c52a71873a
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-06-14 15:38:51 -07:00
ac23e26b6c
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
2010-06-14 15:38:42 -07:00
541bbe3109
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-06-14 15:38:01 -07:00
ec5ef84e8a
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-06-14 15:37:35 -07:00
11aa5acb59
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-06-14 15:37:26 -07:00
f1d30e721b
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-06-14 15:37:17 -07:00
e796e2a03e
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-06-14 15:37:10 -07:00
7eadc495c6
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-06-14 15:37:05 -07:00
b5ba75f385
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2010-06-14 15:37:03 -07:00
dfe881c0ef
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
2010-06-14 15:37:01 -07:00
1e7a75049a
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
2010-06-14 15:37:00 -07:00
c8d75a1c9d
Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch
2010-06-14 15:37:00 -07:00
d9f910d423
Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch
2010-06-14 15:36:59 -07:00
993fa8c15c
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
2010-06-14 15:36:59 -07:00
2c95012288
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2010-06-14 15:36:59 -07:00
3135b5a26a
Update gcc-c90 minor updates
...
Originally these changes were on other gcc-* topic branches but
because c90 touches the same bit of code and I'd like to keep all
the gcc-* branches completely parallel I've moved these few bits
over here. This is one of the downsides of not just having one
big patch stack.
2010-06-14 15:32:54 -07:00
d8e123dc27
Update gcc-unused
...
Fix new instances or changes in gcc flagged unused code. These are
mostly related to variables which are not used when debugging is
disabled and the ASSERTs are compiled out.
2010-06-14 15:29:48 -07:00
b41463f5e8
Update gcc-invalid-prototypes
...
Fix new invalid prototypes, typically just a missing void arg.
2010-06-14 15:25:49 -07:00
b320a7bb4b
Update gcc-unit
...
Fix new possibly uninitialized variables according to gcc.
2010-06-14 15:24:20 -07:00
0a8593375e
Update gcc-missing-case
...
Fix new locations of an incomplete case statement.
2010-06-14 15:19:09 -07:00
1893aa76ec
Update gcc-no-parenthesis
...
Fix new locations of missing parenthesis according to gcc.
2010-06-14 15:16:41 -07:00
48bd88f014
Update gcc-c90
...
Additional c90 fixes required due to ZFS update, these include fixing new
places c99 specific things have been done and some cleanup of old usage.
2010-06-14 15:15:26 -07:00
c943bd62d4
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2010-06-14 14:44:43 -07:00
a53a9b9e9d
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-06-14 14:44:42 -07:00
6b17084f5f
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-06-14 14:44:31 -07:00
a54633ce22
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
2010-06-14 14:44:23 -07:00
e0ee5701db
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-06-14 14:43:46 -07:00
e35eb21d6a
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-06-14 14:43:24 -07:00
80f7cfa759
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-06-14 14:43:16 -07:00
3699b41583
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-06-14 14:43:07 -07:00
4152507366
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-06-14 14:43:02 -07:00
bdf5763c0a
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-06-14 14:42:58 -07:00
9f9a451561
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2010-06-14 14:42:57 -07:00
fc490c18b6
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
2010-06-14 14:42:56 -07:00
dd8f6da3da
Update gcc-cast
...
Fix new instances of missing casts or assumed types.
2010-06-14 14:40:10 -07:00
2d5e0d711a
Merge branch 'linux-debug-zerocopy' into refs/top-bases/linux-zfs-branch
...
Conflicts:
module/zfs/zil.c
2010-05-28 22:23:23 -07:00
63532dab9f
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
...
Conflicts:
module/zfs/include/sys/zfs_context.h
2010-05-28 22:22:13 -07:00
a054b40984
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
...
Conflicts:
cmd/zpool/zpool_main.c
2010-05-28 22:20:07 -07:00
d07f996713
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
...
Conflicts:
module/zfs/zfs_ioctl.c
2010-05-28 22:18:29 -07:00
fe4485488c
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
...
Conflicts:
module/zcommon/include/sys/fs/zfs.h
module/zfs/include/sys/zfs_ioctl.h
2010-05-28 22:16:13 -07:00
b41143632b
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
...
Conflicts:
cmd/zpool/zpool_main.c
cmd/zpool/zpool_vdev.c
cmd/ztest/ztest.c
lib/libzfs/libzfs_dataset.c
lib/libzfs/libzfs_import.c
lib/libzfs/libzfs_mount.c
lib/libzfs/libzfs_pool.c
lib/libzfs/libzfs_sendrecv.c
lib/libzpool/include/sys/zfs_context.h
module/zcommon/include/sys/fs/zfs.h
module/zcommon/zfs_comutil.c
module/zfs/arc.c
module/zfs/dmu.c
module/zfs/dmu_objset.c
module/zfs/dmu_send.c
module/zfs/dmu_tx.c
module/zfs/dsl_dataset.c
module/zfs/dsl_dir.c
module/zfs/dsl_scrub.c
module/zfs/fm.c
module/zfs/include/sys/dmu.h
module/zfs/include/sys/fm/fs/zfs.h
module/zfs/include/sys/fm/protocol.h
module/zfs/include/sys/spa.h
module/zfs/include/sys/zfs_context.h
module/zfs/include/sys/zfs_ioctl.h
module/zfs/include/sys/zvol.h
module/zfs/spa.c
module/zfs/spa_boot.c
module/zfs/spa_history.c
module/zfs/spa_misc.c
module/zfs/txg.c
module/zfs/vdev.c
module/zfs/zfs_fm.c
module/zfs/zfs_ioctl.c
module/zfs/zfs_replay.c
module/zfs/zfs_znode.c
module/zfs/zil.c
module/zfs/zio.c
2010-05-28 22:14:39 -07:00
804b4e0210
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-05-28 21:42:29 -07:00
5e8f78191e
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
...
Conflicts:
module/zfs/dmu_send.c
module/zfs/spa_history.c
module/zfs/txg.c
module/zfs/zfs_ioctl.c
2010-05-28 21:31:31 -07:00
a6c16054e5
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
...
Conflicts:
module/zcommon/include/sys/fs/zfs.h
module/zfs/dmu.c
module/zfs/dsl_dataset.c
module/zfs/include/sys/dmu.h
module/zfs/include/sys/spa.h
module/zfs/include/sys/zfs_ioctl.h
module/zfs/include/sys/zvol.h
module/zfs/zfs_replay.c
module/zfs/zfs_znode.c
2010-05-28 21:26:02 -07:00
6860ec4c1d
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
...
Conflicts:
module/zfs/zfs_ioctl.c
2010-05-28 16:58:21 -07:00
010e4e2f97
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-05-28 16:43:15 -07:00
7008960b9e
Merge commit 'refs/top-bases/linux-events' into linux-events
...
Conflicts:
lib/libzpool/include/sys/zfs_context.h
module/zcommon/include/sys/fs/zfs.h
module/zfs/dsl_scrub.c
module/zfs/fm.c
module/zfs/include/sys/fm/fs/zfs.h
module/zfs/include/sys/fm/protocol.h
module/zfs/include/sys/spa.h
module/zfs/include/sys/zfs_context.h
module/zfs/spa.c
module/zfs/spa_misc.c
module/zfs/vdev.c
module/zfs/zfs_fm.c
2010-05-28 16:42:29 -07:00
82b9a38cdb
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2010-05-28 16:01:54 -07:00
97c49607ec
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
...
Conflicts:
module/zcommon/zfs_comutil.c
module/zfs/arc.c
module/zfs/dmu_objset.c
module/zfs/dmu_tx.c
module/zfs/dsl_dataset.c
module/zfs/dsl_dir.c
module/zfs/spa.c
module/zfs/spa_boot.c
module/zfs/spa_misc.c
module/zfs/vdev.c
module/zfs/zil.c
module/zfs/zio.c
2010-05-28 16:01:35 -07:00
812761eac5
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
...
Conflicts:
cmd/ztest/ztest.c
2010-05-28 15:46:10 -07:00
e27754d9e8
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
...
Conflicts:
cmd/ztest/ztest.c
lib/libzfs/libzfs_sendrecv.c
module/zfs/dmu_objset.c
module/zfs/dnode.c
module/zfs/dnode_sync.c
module/zfs/dsl_dataset.c
module/zfs/include/sys/dmu_tx.h
module/zfs/include/sys/txg.h
module/zfs/spa_history.c
2010-05-28 15:45:38 -07:00
ffaa677995
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
...
Conflicts:
module/zfs/dbuf.c
module/zfs/dsl_dataset.c
2010-05-28 15:38:43 -07:00
3e2be634a5
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
...
Conflicts:
cmd/zdb/zdb.c
cmd/zdb/zdb_il.c
cmd/zfs/zfs_main.c
cmd/zfs/zfs_util.h
cmd/zinject/zinject.h
cmd/zpool/zpool_main.c
cmd/zpool/zpool_util.c
cmd/ztest/ztest.c
lib/libnvpair/include/libnvpair.h
lib/libnvpair/libnvpair.c
lib/libzfs/libzfs_changelist.c
lib/libzfs/libzfs_config.c
lib/libzfs/libzfs_dataset.c
lib/libzfs/libzfs_import.c
lib/libzfs/libzfs_mount.c
lib/libzfs/libzfs_pool.c
lib/libzfs/libzfs_sendrecv.c
module/avl/avl.c
module/avl/include/sys/avl.h
module/nvpair/include/sys/nvpair.h
module/nvpair/nvpair.c
module/zcommon/include/zfs_comutil.h
module/zcommon/include/zfs_prop.h
module/zcommon/zfs_comutil.c
module/zfs/arc.c
module/zfs/dbuf.c
module/zfs/dmu.c
module/zfs/dmu_objset.c
module/zfs/dmu_zfetch.c
module/zfs/dnode_sync.c
module/zfs/dsl_dataset.c
module/zfs/dsl_pool.c
module/zfs/dsl_prop.c
module/zfs/dsl_synctask.c
module/zfs/include/sys/dmu_tx.h
module/zfs/include/sys/dmu_zfetch.h
module/zfs/include/sys/dsl_synctask.h
module/zfs/include/sys/refcount.h
module/zfs/include/sys/txg.h
module/zfs/include/sys/uberblock.h
module/zfs/include/sys/zap_leaf.h
module/zfs/include/sys/zfs_debug.h
module/zfs/include/sys/zfs_znode.h
module/zfs/include/sys/zio_compress.h
module/zfs/include/sys/zvol.h
module/zfs/lzjb.c
module/zfs/metaslab.c
module/zfs/refcount.c
module/zfs/sha256.c
module/zfs/spa.c
module/zfs/spa_boot.c
module/zfs/uberblock.c
module/zfs/vdev.c
module/zfs/zap_micro.c
module/zfs/zfs_ioctl.c
module/zfs/zfs_replay.c
module/zfs/zio.c
module/zfs/zio_compress.c
2010-05-28 15:34:57 -07:00
d60fc5ca30
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
...
Conflicts:
module/zfs/dbuf.c
module/zfs/dmu.c
module/zfs/dmu_objset.c
module/zfs/dnode_sync.c
module/zfs/dsl_dataset.c
module/zfs/dsl_prop.c
module/zfs/metaslab.c
module/zfs/spa.c
module/zfs/vdev.c
module/zfs/zap_micro.c
2010-05-28 15:07:36 -07:00
cd47feb3c8
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
...
Conflicts:
cmd/zpool/zpool_main.c
cmd/ztest/ztest.c
module/zfs/arc.c
2010-05-28 14:56:00 -07:00
28e07224db
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
...
Conflicts:
lib/libzfs/libzfs_dataset.c
module/zfs/dmu_objset.c
module/zfs/dsl_dataset.c
module/zfs/dsl_pool.c
module/zfs/spa.c
module/zfs/zfs_ioctl.c
module/zfs/zio.c
2010-05-28 14:54:33 -07:00
abfb2a3e1d
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
...
Conflicts:
lib/libzfs/libzfs_changelist.c
module/zfs/spa.c
module/zfs/zfs_ioctl.c
2010-05-28 14:49:40 -07:00
3571832262
Merge commit 'refs/top-bases/gcc-missing-braces' into gcc-missing-braces
...
Conflicts:
cmd/zdb/zdb.c
cmd/ztest/ztest.c
lib/libzfs/libzfs_dataset.c
lib/libzfs/libzfs_pool.c
lib/libzfs/libzfs_sendrecv.c
2010-05-28 14:46:39 -07:00
2591cac812
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
...
Conflicts:
cmd/zdb/zdb_il.c
cmd/ztest/ztest.c
lib/libzfs/libzfs_mount.c
2010-05-28 14:42:40 -07:00
475bf41d1c
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
...
Conflicts:
cmd/zfs/zfs_main.c
cmd/zpool/zpool_main.c
cmd/ztest/ztest.c
2010-05-28 14:36:18 -07:00
957b7b41d4
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
...
Conflicts:
cmd/zdb/zdb.c
cmd/ztest/ztest.c
module/zfs/dbuf.c
module/zfs/dsl_dataset.c
module/zfs/dsl_scrub.c
module/zfs/spa.c
module/zfs/vdev.c
module/zfs/zio.c
2010-05-28 14:19:22 -07:00
89089d1e4b
Merge commit 'refs/top-bases/fix-stack' into fix-stack
...
Conflicts:
module/zfs/dmu_objset.c
module/zfs/spa_history.c
2010-05-28 13:54:08 -07:00
31630287ca
Merge branch 'fix-dbuf_dirty_record_t' into refs/top-bases/fix-branch
...
Conflicts:
lib/libzfs/libzfs_sendrecv.c
module/zfs/dmu_objset.c
module/zfs/dnode.c
module/zfs/dsl_dataset.c
module/zfs/spa_history.c
2010-05-28 13:51:29 -07:00
ab1a68b225
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
...
Conflicts:
module/zfs/dnode_sync.c
2010-05-28 13:46:45 -07:00
428870ff73
Update core ZFS code from build 121 to build 141.
2010-05-28 13:45:14 -07:00
ea356d9855
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2010-05-28 12:43:02 -07:00
6324adf280
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-05-28 12:43:01 -07:00
885089decd
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-05-28 12:42:57 -07:00
79e7a65233
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
2010-05-28 12:42:55 -07:00
525b1f371b
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-05-28 12:42:44 -07:00
0e19c10052
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-05-28 12:42:37 -07:00
9f27168dfc
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-05-28 12:42:35 -07:00
Brian Behlendorf