Brian Behlendorf
69b2257940
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-06 15:38:51 -07:00
Brian Behlendorf
8463b9e01e
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2009-07-06 15:38:50 -07:00
Brian Behlendorf
3a8e684d73
Additional lock calls were added to ztest and they must be updated
...
to use the pthread's API in favour of Solaris threads.
2009-07-06 15:31:54 -07:00
Brian Behlendorf
c58b9ed603
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-07-06 15:21:26 -07:00
Brian Behlendorf
149c4b2731
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
...
Conflicts:
cmd/ztest/ztest.c
lib/libzfs/libzfs_pool.c
module/zcommon/zfs_namecheck.c
module/zfs/dmu.c
module/zfs/include/sys/dmu.h
module/zfs/include/sys/zfs_fuid.h
module/zfs/spa.c
module/zfs/vdev.c
module/zfs/zap_micro.c
module/zfs/zfs_fuid.c
module/zfs/zfs_ioctl.c
module/zfs/zfs_vfsops.c
module/zfs/zfs_znode.c
2009-07-06 13:40:29 -07:00
Brian Behlendorf
658459249e
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-06 13:17:28 -07:00
Brian Behlendorf
926b04acba
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
...
Conflicts:
cmd/ztest/ztest.c
2009-07-06 13:17:16 -07:00
Brian Behlendorf
cd098f87c8
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
...
Conflicts:
cmd/ztest/ztest.c
2009-07-06 13:16:29 -07:00
Brian Behlendorf
8795d8f034
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2009-07-06 13:15:43 -07:00
Brian Behlendorf
95ba24ed69
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
...
Conflicts:
cmd/ztest/ztest.c
2009-07-06 13:15:35 -07:00
Brian Behlendorf
a1ccb00b7e
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
...
Conflicts:
cmd/ztest/ztest.c
module/zfs/zil.c
2009-07-06 13:11:34 -07:00
Brian Behlendorf
e2b2597751
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
...
Conflicts:
cmd/zdb/zdb_il.c
cmd/zfs/zfs_main.c
cmd/zinject/zinject.c
cmd/ztest/ztest.c
lib/libzfs/libzfs_dataset.c
lib/libzfs/libzfs_graph.c
module/zcommon/include/sys/fm/fs/zfs.h
module/zcommon/include/zfs_deleg.h
module/zcommon/include/zfs_namecheck.h
module/zcommon/zfs_deleg.c
module/zcommon/zfs_namecheck.c
module/zcommon/zprop_common.c
module/zfs/arc.c
module/zfs/dmu.c
module/zfs/dmu_object.c
module/zfs/dmu_objset.c
module/zfs/dsl_pool.c
module/zfs/dsl_prop.c
module/zfs/fletcher.c
module/zfs/include/sys/dsl_deleg.h
module/zfs/include/sys/dsl_prop.h
module/zfs/include/sys/metaslab_impl.h
module/zfs/include/sys/spa_boot.h
module/zfs/include/sys/zap.h
module/zfs/include/sys/zap_impl.h
module/zfs/include/sys/zfs_context.h
module/zfs/include/sys/zfs_ctldir.h
module/zfs/include/sys/zfs_dir.h
module/zfs/include/sys/zfs_fuid.h
module/zfs/include/sys/zfs_ioctl.h
module/zfs/spa.c
module/zfs/spa_errlog.c
module/zfs/spa_history.c
module/zfs/zap.c
module/zfs/zap_leaf.c
module/zfs/zap_micro.c
module/zfs/zfs_ioctl.c
module/zfs/zio.c
2009-07-02 16:49:11 -07:00
Brian Behlendorf
e9f14862a5
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
...
Conflicts:
module/zfs/dmu_objset.c
module/zfs/spa.c
module/zfs/vdev.c
module/zfs/vdev_label.c
module/zfs/zio.c
2009-07-02 16:18:03 -07:00
Brian Behlendorf
9babb37438
Rebase master to b117
2009-07-02 15:44:48 -07:00
Brian Behlendorf
e3d5b2a900
Refresh autogen products
2009-07-01 11:37:26 -07:00
Brian Behlendorf
80cfd98d8e
Refresh autogen products
2009-06-09 16:46:26 -07:00
Brian Behlendorf
26f70525ee
Refresh autogen products
2009-06-08 16:33:33 -07:00
Brian Behlendorf
cfd4735d0b
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-03-20 09:34:01 -07:00
Brian Behlendorf
1b2503a433
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-03-20 09:29:26 -07:00
Brian Behlendorf
f53e5a851d
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-20 09:29:22 -07:00
Brian Behlendorf
0c88bc3ccd
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2009-03-20 09:29:21 -07:00
Brian Behlendorf
13814fe220
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
2009-03-20 09:29:16 -07:00
Brian Behlendorf
99da5f93e8
Fix uninitialized variable error in ztest_dmu_commit_callbacks()
2009-03-20 09:20:49 -07:00
Brian Behlendorf
2099e8d984
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-03-19 21:32:42 -07:00
Brian Behlendorf
56d18263ed
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-03-19 21:28:54 -07:00
Brian Behlendorf
bd1685ee4e
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-19 21:28:51 -07:00
Brian Behlendorf
1769e10f17
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2009-03-19 21:28:50 -07:00
Brian Behlendorf
63781842e3
Update mutex_lock to pthread_mutex_lock for zcl->zcl_callback_locks.
2009-03-19 21:21:35 -07:00
Brian Behlendorf
51b59652a3
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-03-19 21:13:28 -07:00
Brian Behlendorf
7f33364d3c
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
...
Conflicts:
lib/libzpool/include/sys/zfs_context.h
module/zfs/dmu_tx.c
module/zfs/txg.c
2009-03-19 21:03:58 -07:00
Brian Behlendorf
e7f02d3b41
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-19 20:59:33 -07:00
Brian Behlendorf
eb811f7fa9
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
...
Conflicts:
module/zfs/include/sys/dmu_tx.h
module/zfs/include/sys/txg.h
2009-03-19 20:59:12 -07:00
Brian Behlendorf
54b5b41a58
Add 'feature-pthreads' branch to features branch.
2009-03-19 20:49:52 -07:00
Brian Behlendorf
29703a5b4e
Add 'feature-commit-cb' branch for DMU commit callbacks.
2009-03-19 20:30:14 -07:00
Brian Behlendorf
61cd467f6d
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-03-19 19:58:45 -07:00
Brian Behlendorf
5e5d31f105
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
...
Conflicts:
lib/libzpool/include/sys/zfs_context.h
2009-03-19 19:52:21 -07:00
Brian Behlendorf
8c43ad3853
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-19 19:49:56 -07:00
Brian Behlendorf
8cdcf1ef44
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2009-03-19 19:49:55 -07:00
Brian Behlendorf
53db4c7b29
Revert fix-pthreads moving to feature-pthreads branch
2009-03-19 19:43:09 -07:00
Brian Behlendorf
04621618cf
Refresh autogen products
2009-03-18 15:05:35 -07:00
Brian Behlendorf
e61fa20d11
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-03-18 14:40:31 -07:00
Brian Behlendorf
c6ddce0341
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-03-18 14:31:53 -07:00
Brian Behlendorf
70407622a7
Move `make check` ztest under ./scripts where the module stack is loaded.
2009-03-18 14:19:04 -07:00
Brian Behlendorf
7fa1ced508
Refresh autogen products, remove stray zdump Makefile.in
2009-03-12 16:48:12 -07:00
Brian Behlendorf
0fe418c548
Refresh autogen products
2009-03-12 15:55:23 -07:00
Brian Behlendorf
b103899a39
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-03-12 15:54:18 -07:00
Brian Behlendorf
c7979c6f55
Check realpath() return code.
2009-03-12 15:49:23 -07:00
Brian Behlendorf
6a1223268c
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-03-12 15:47:43 -07:00
Brian Behlendorf
71bc2e8c03
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-03-12 15:47:36 -07:00
Brian Behlendorf
5a7e7e9d3b
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-03-12 15:44:18 -07:00
Brian Behlendorf
82ce8b00f3
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-12 15:44:14 -07:00
Brian Behlendorf
6a5acaa105
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-03-12 15:44:13 -07:00
Brian Behlendorf
9fe5b916e2
Merge branch 'gcc-fortify-source' into refs/top-bases/gcc-branch
2009-03-12 15:39:27 -07:00
Brian Behlendorf
9e49df6b20
Add gcc-fortify-source branch
2009-03-12 15:38:51 -07:00
Brian Behlendorf
808e542240
Refresh autogen products
2009-03-12 11:06:21 -07:00
Brian Behlendorf
635e9ba8a0
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-03-12 10:41:10 -07:00
Brian Behlendorf
98e7b9f354
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-03-12 10:41:02 -07:00
Brian Behlendorf
9bdbd7c8f7
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-03-12 10:37:18 -07:00
Brian Behlendorf
b9b399bf04
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-12 10:37:14 -07:00
Brian Behlendorf
a03187bb3b
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-03-12 10:37:12 -07:00
Brian Behlendorf
f8fe8a76f4
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
2009-03-12 10:37:11 -07:00
Brian Behlendorf
cabd4a69c4
Resolve remaining uninitialized variables
...
Most of these fixes appear to be harmless and should never occur.
However, there were a few cases in this patch which do concern me,
I doubt we're seeing them but they look possible... mainly in the
user tools.
2009-03-12 10:30:41 -07:00
Brian Behlendorf
9fb7b2f3bf
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-03-12 09:28:01 -07:00
Brian Behlendorf
396b45acc8
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-03-12 09:27:52 -07:00
Brian Behlendorf
308a05919a
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-03-12 09:24:35 -07:00
Brian Behlendorf
2e9568b6be
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-12 09:24:32 -07:00
Brian Behlendorf
fba88e48f2
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2009-03-12 09:24:31 -07:00
Brian Behlendorf
9de6723b83
ztest_resume should be ztest_resume_thread in pthread_create()
...
Fix an accidental bug introducted by the pthreads changes. When creating
a resume thread the handler function was accidentally changed from
ztest_resume to ztest_resume_thread. There's a decent chance this
may explain some/all of the crashes that have be observed running
ztest. This issue was exposed and easily fixed once the -Wno-unused
check was removed from the build system. Happily at least one real
bug fix resulted from that cleanup.
2009-03-12 09:13:40 -07:00
Brian Behlendorf
0b5ddcfdca
Refresh autogen products
2009-03-11 22:31:29 -07:00
Brian Behlendorf
378663e310
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-03-11 21:03:25 -07:00
Brian Behlendorf
1fcdd63cc6
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-03-11 21:03:21 -07:00
Brian Behlendorf
c351352990
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-03-11 20:59:46 -07:00
Brian Behlendorf
4c042de40b
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-11 20:59:43 -07:00
Brian Behlendorf
60ac8152fe
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-03-11 20:59:42 -07:00
Brian Behlendorf
9915249546
Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch
2009-03-11 20:53:11 -07:00
Brian Behlendorf
d4dbc7dca8
Resolve all instances of missing braces.
2009-03-11 20:52:21 -07:00
Brian Behlendorf
8cb718a76c
Refresh autogen products
2009-03-11 14:25:09 -07:00
Brian Behlendorf
b8dd7de0b5
Refresh autogen products
2009-03-11 13:30:38 -07:00
Brian Behlendorf
d8f08a37c1
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-03-11 10:45:09 -07:00
Brian Behlendorf
ab3f1d72e8
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-03-11 10:45:02 -07:00
Brian Behlendorf
73c738d1ce
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-03-11 10:40:37 -07:00
Brian Behlendorf
8eaf19dae8
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-11 10:40:33 -07:00
Brian Behlendorf
d43e9ca262
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-03-11 10:40:31 -07:00
Brian Behlendorf
d641369d38
Merge branch 'gcc-64bit-constants' into refs/top-bases/gcc-branch
2009-03-11 10:32:45 -07:00
Ricardo M. Correia
fd9a7a0fb4
Add 'ull' suffix to 64-bit constants.
2009-03-11 10:31:24 -07:00
Brian Behlendorf
e1b736ecc8
Refresh autogen products
2009-03-10 11:42:01 -07:00
Brian Behlendorf
b4a92368d2
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-01-15 15:56:36 -08:00
Brian Behlendorf
4f715bee61
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-01-15 15:56:30 -08:00
Brian Behlendorf
20d418a96c
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-01-15 15:54:39 -08:00
Brian Behlendorf
85c77e1c82
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-15 15:54:35 -08:00
Brian Behlendorf
ee7f10a6b3
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2009-01-15 15:54:34 -08:00
Brian Behlendorf
cf9a5530e1
Fix pthreads prototype
2009-01-15 15:52:12 -08:00
Brian Behlendorf
f863f8f848
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-01-15 14:22:27 -08:00
Brian Behlendorf
2a0e254804
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-01-15 14:22:20 -08:00
Brian Behlendorf
1f372d9030
Resolve conflict with removed cleaner type
2009-01-15 14:18:01 -08:00
Brian Behlendorf
ddaad20220
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-15 14:16:23 -08:00
Brian Behlendorf
a42707fcc0
Resolve conflict with removed cleaner type
2009-01-15 14:16:03 -08:00
Brian Behlendorf
da7151a89e
Resolve conflict with removed cleaner type
2009-01-15 14:11:19 -08:00
Brian Behlendorf
3fa768e21b
Resolve conflict with removed cleaner type
2009-01-15 14:04:35 -08:00
Brian Behlendorf
d3df6b2012
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2009-01-15 14:01:51 -08:00