Brian Behlendorf
b2e459dab0
Add explicit casts for (u_longlong_t) when printing uint64_t.
2009-07-08 09:07:13 -07:00
Brian Behlendorf
5534447477
Add explicit casts for (u_longlong_t) when printing uint64_t.
2009-07-08 09:06:03 -07:00
Brian Behlendorf
b2dcbdf490
Resolve a 2 new cases of for loop variable declared in for()
2009-07-08 09:04:21 -07:00
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
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
01c3cfc58f
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
...
Conflicts:
module/zfs/zil.c
2009-07-06 13:12:23 -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
dbaf4f6c0f
Merge commit 'refs/top-bases/gcc-fortify-source' into gcc-fortify-source
...
Conflicts:
cmd/ztest/ztest.c
2009-07-02 17:08:30 -07:00
Brian Behlendorf
480b03791d
Merge commit 'refs/top-bases/gcc-missing-braces' into gcc-missing-braces
...
Conflicts:
lib/libzfs/libzfs_dataset.c
2009-07-02 17:07:52 -07:00
Brian Behlendorf
44703f0029
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
...
Conflicts:
lib/libzfs/libzfs_dataset.c
module/zfs/arc.c
module/zfs/spa.c
2009-07-02 16:57:09 -07:00
Brian Behlendorf
a5a71d128d
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
...
Conflicts:
lib/libzfs/libzfs_dataset.c
module/zfs/spa.c
2009-07-02 16:52:07 -07:00
Brian Behlendorf
5a2a5d64a5
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
2009-07-02 16:51:09 -07:00
Brian Behlendorf
b095bf444a
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
...
Conflicts:
cmd/zfs/zfs_main.c
lib/libzfs/libzfs_dataset.c
2009-07-02 16:50:53 -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
e1d6e67473
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-05-22 16:36:23 -07:00
Brian Behlendorf
9c53917bd5
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-05-22 16:36:23 -07:00
Brian Behlendorf
e56aa929e8
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
2009-05-22 16:36:22 -07:00
Brian Behlendorf
8e9605062a
Explictly use signed char for portability. On x86/x86_64
...
systems the default char type is signed, on ppc/ppc64 systems
the default char type is unsigned.
2009-05-22 16:30:47 -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
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
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
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
05cec154f5
Merge branch 'fix-pthreads' into refs/top-bases/fix-branch
2009-03-19 19:49:53 -07:00
Brian Behlendorf
53db4c7b29
Revert fix-pthreads moving to feature-pthreads branch
2009-03-19 19:43:09 -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
be112b3f57
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-16 10:30:31 -07:00
Brian Behlendorf
5ee8a85ba6
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2009-03-16 10:30:27 -07:00
Brian Behlendorf
9818e69640
Merge branch 'fix-deadcode' into refs/top-bases/fix-branch
2009-03-16 10:12:01 -07:00
Brian Behlendorf
2924858552
Remove two self referential functions.
...
Newer versions of gcc (4.3.0) detected the following unused
code segments.
2009-03-16 10:02:06 -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
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
dd30dba016
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-12 10:00:04 -07:00
Brian Behlendorf
193ea156e9
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-03-12 10:00:03 -07:00
Brian Behlendorf
eceaf813ad
Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch
2009-03-12 10:00:01 -07:00
Brian Behlendorf
f2d72af596
Add remaining missing cases (or a default) to all switch statements.
...
The previous code was not wrong, but this prevents gcc from warning
us about missing cases for these known safe switch statements. The
-Wno-missing-cases can now be removed to detect places where we
accidentally forgot a case.
2009-03-12 09:53:08 -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
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
1ca6578ebc
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-11 14:08:51 -07:00
Brian Behlendorf
8a3b1a5ff5
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-03-11 14:08:50 -07:00
Brian Behlendorf
e5011401cd
Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch
2009-03-11 14:08:48 -07:00
Brian Behlendorf
3226eea157
Resolve additional cases where gcc wants extra parenthesis.
...
These were introduced by the rebase to b108.
2009-03-11 13:57:47 -07:00
Brian Behlendorf
dff484a388
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-11 11:09:13 -07:00
Brian Behlendorf
5f30a3cb0e
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-03-11 11:09:11 -07:00
Brian Behlendorf
8fe801fd8f
Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch
2009-03-11 11:00:42 -07:00
Ricardo M. Correia
af45030850
Added 'gcc-ident-pragmas' branch.
2009-03-11 10:59:45 -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
7872d84be6
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-02-18 14:30:54 -08:00
Brian Behlendorf
15f5ddebdf
Merge commit 'refs/top-bases/fix-pthreads' into fix-pthreads
...
Conflicts:
lib/libzpool/kernel.c
2009-02-18 14:29:08 -08:00
Brian Behlendorf
f0a8aedfbc
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
...
Conflicts:
lib/libzpool/kernel.c
module/zfs/arc.c
2009-02-18 14:27:12 -08:00
Brian Behlendorf
fc8954db24
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
2009-02-18 13:12:48 -08:00
Brian Behlendorf
e203e7b48f
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
2009-02-18 13:12:35 -08:00
Brian Behlendorf
f686a87058
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
...
Conflicts:
module/zfs/arc.c
2009-02-18 13:12:26 -08:00
Brian Behlendorf
3b17164f71
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
...
Conflicts:
module/zfs/vdev.c
module/zfs/zio.c
2009-02-18 13:09:32 -08:00
Brian Behlendorf
d164b20935
Rebase master to b108
2009-02-18 12:51:31 -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
0197f3a298
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-15 15:40:39 -08:00
Brian Behlendorf
975c613269
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-01-15 15:40:39 -08:00
Brian Behlendorf
51730cdeae
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2009-01-15 15:40:37 -08:00
Brian Behlendorf
37a3478d58
Resolve C90 int declared in for() construct
2009-01-15 15:38:26 -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
86e39f5e3b
Resolve conflict with removed cleaner type
2009-01-15 14:05:21 -08:00
Brian Behlendorf
a2e601c6e3
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
2009-01-15 14:04:39 -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
Brian Behlendorf
fb5f0bc833
Rebase master to b105
2009-01-15 13:59:39 -08:00
Brian Behlendorf
9c22d76019
Minor 'make check' updates
2009-01-14 15:38:56 -08:00
Brian Behlendorf
ce7115b807
Add unicode makefile references and support
2009-01-05 12:33:09 -08:00
Brian Behlendorf
6fd7b17036
Remove remaining zdump Makefile references
2009-01-05 11:18:06 -08:00
Brian Behlendorf
88ddd54799
Remove zdump Makefiles
2009-01-05 11:12:44 -08:00
Brian Behlendorf
578a1db888
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-05 11:11:56 -08:00
Brian Behlendorf
e5547d3cbf
Merge commit 'refs/top-bases/fix-pthreads' into fix-pthreads
2009-01-05 11:11:47 -08:00
Brian Behlendorf
adc6253cbf
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-01-05 11:11:33 -08:00
Brian Behlendorf
d1410e11bc
Remove zdump.c
2009-01-05 11:11:21 -08:00
Brian Behlendorf
9fd00aa162
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
2009-01-05 11:11:05 -08:00
Brian Behlendorf
148d093b76
Remove zdump.c
2009-01-05 11:11:02 -08:00
Brian Behlendorf
1ed474aa0d
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2009-01-05 11:10:31 -08:00
Brian Behlendorf
36b849fa51
Remove zdump, it's an unrelateds command which I added simply due to the z* command convention
2009-01-05 11:10:13 -08:00
Brian Behlendorf
fdffe91056
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-22 16:55:59 -08:00
Brian Behlendorf
0844495710
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2008-12-22 16:55:58 -08:00
Brian Behlendorf
f3d55cb4f5
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-22 16:55:52 -08:00
Brian Behlendorf
30b961af2c
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
2008-12-22 16:55:50 -08:00
Brian Behlendorf
3a76148338
Add a needed lib
2008-12-22 16:52:26 -08:00
Brian Behlendorf
9ef0280a5c
Use pthread_
2008-12-22 16:51:28 -08:00
Brian Behlendorf
683f0b1d6c
Fix cast
2008-12-22 16:50:44 -08:00
Brian Behlendorf
44f75e4f86
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-22 16:40:35 -08:00
Brian Behlendorf
e8e738e3b9
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2008-12-22 16:40:34 -08:00
Brian Behlendorf
f016a8e15f
Update patch carried forward from old release
2008-12-22 16:35:36 -08:00
Brian Behlendorf
36c5ea8174
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-22 16:30:37 -08:00
Brian Behlendorf
43abce68c5
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2008-12-22 16:30:35 -08:00
Brian Behlendorf
8ab0586445
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-22 16:30:29 -08:00
Brian Behlendorf
a6152094d0
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
2008-12-22 16:30:27 -08:00
Brian Behlendorf
dee065ca8d
Use pthread versions
2008-12-22 16:26:23 -08:00
Brian Behlendorf
6a394806f5
Prototype fixes
2008-12-22 16:18:07 -08:00
Brian Behlendorf
419cff0fd3
Add more more missing headers
2008-12-22 16:02:08 -08:00
Brian Behlendorf
d56b3c2440
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2008-12-22 15:51:14 -08:00
Brian Behlendorf
720f34ffbe
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-22 15:51:14 -08:00
Brian Behlendorf
f58a0bf4ec
Remove now unneeded verify
2008-12-22 15:49:13 -08:00
Brian Behlendorf
67a52f2701
Add more missing include paths
2008-12-22 15:48:05 -08:00
Brian Behlendorf
27dd5bca77
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-22 15:36:15 -08:00
Brian Behlendorf
1f19965f10
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-22 15:36:14 -08:00
Brian Behlendorf
262c2c49c1
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
2008-12-22 15:36:13 -08:00
Brian Behlendorf
088c5451b7
Add missing include
2008-12-22 15:34:18 -08:00
Brian Behlendorf
9b3b373d4f
Fix prototypes, why not invalid persay. They use the traditional pre-standard form and were depricated as of C99
2008-12-22 15:33:15 -08:00
Brian Behlendorf
7403ce6856
Add missing Makefile foo
2008-12-22 11:38:58 -08:00
Brian Behlendorf
6b1fc7b8ee
Add linker flags
2008-12-22 11:27:30 -08:00
Brian Behlendorf
356e666729
Add linker flags
2008-12-22 11:26:16 -08:00
Brian Behlendorf
9fb38f075b
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-22 11:25:39 -08:00
Brian Behlendorf
24a90ad2c3
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-22 11:25:38 -08:00
Brian Behlendorf
34d556babb
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
2008-12-22 11:25:37 -08:00
Brian Behlendorf
7c89e6b7d5
Fix prototype
2008-12-22 11:25:28 -08:00
Brian Behlendorf
feb8953178
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-22 11:07:39 -08:00
Brian Behlendorf
b8245db563
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2008-12-22 11:07:38 -08:00
Brian Behlendorf
03c0e92dfa
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
2008-12-22 11:07:35 -08:00
Brian Behlendorf
e18ac20f8c
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-22 11:07:35 -08:00
Brian Behlendorf
feb8aecd47
Fix prototype
2008-12-22 11:05:41 -08:00
Brian Behlendorf
fdd6fa0727
We don't need to #undef verify here, this is handled better now with the verify cleanup
2008-12-22 11:02:23 -08:00
Brian Behlendorf
4bf318d0a8
Add needed libs
2008-12-22 11:00:47 -08:00
Brian Behlendorf
a9e37c248d
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-22 10:23:16 -08:00
Brian Behlendorf
342c4d05d6
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-22 10:23:15 -08:00
Brian Behlendorf
817ecade1a
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
2008-12-22 10:23:14 -08:00
Brian Behlendorf
6da71c1404
Fix twop more missing voids in prototypes
2008-12-22 10:20:57 -08:00
Brian Behlendorf
b58e34e0d8
Update makefiles
2008-12-22 09:22:39 -08:00
Brian Behlendorf
98810ac9fb
Update zpool Makefile
2008-12-22 09:10:00 -08:00
Brian Behlendorf
cb859a27ba
Add librt for clock_gettime
2008-12-22 09:06:24 -08:00
Brian Behlendorf
c8ad9946dc
use zlib
2008-12-19 16:58:20 -08:00
Brian Behlendorf
cc92d6497b
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-19 11:05:49 -08:00
Brian Behlendorf
d67cf69e08
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-19 11:05:49 -08:00
Brian Behlendorf
893a49fa9a
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2008-12-19 11:05:48 -08:00
Brian Behlendorf
9041f66bad
Fix all instances of for (int i;;) {} that were easily found
2008-12-19 11:03:54 -08:00
Brian Behlendorf
6481bdc3e7
Add -lm linker flag
2008-12-17 16:16:22 -08:00
Brian Behlendorf
1dfec71003
Add -pthreads
2008-12-17 13:51:11 -08:00
Brian Behlendorf
7973e77bfc
Re-add zpool (part of it), we need to build it for the common bits
2008-12-17 11:12:06 -08:00
Brian Behlendorf
0209bfd7a4
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-17 10:20:16 -08:00
Brian Behlendorf
137c1015bd
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-17 10:20:15 -08:00
Brian Behlendorf
d4c1e8b600
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
2008-12-17 10:20:14 -08:00
Brian Behlendorf
087b2876bb
Fix NULL should be 0 usage
2008-12-17 10:18:09 -08:00
Brian Behlendorf
640c2f8d7e
Add missing includes to zfs cmd Makefile.am
2008-12-17 09:22:40 -08:00
Brian Behlendorf
1e64eb4c07
Update makefiles for currently working tools
2008-12-16 16:51:23 -08:00
Brian Behlendorf
a7b063d224
Add DEFAULT_INCLUDE to rules, adjust = to += accordingly
2008-12-16 08:58:41 -08:00
Brian Behlendorf
7005de9a0c
Refresh Makefile.am's
2008-12-12 09:20:33 -08:00
Brian Behlendorf
d4ae03c700
Add initial stub makefile, details need filling in
2008-12-12 08:50:07 -08:00
Brian Behlendorf
f07f82e93a
Merge commit 'refs/top-bases/fix-pthreads' into fix-pthreads
2008-12-11 11:26:43 -08:00
Brian Behlendorf
756a122d37
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-11 11:25:42 -08:00
Brian Behlendorf
b342e90e44
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
2008-12-11 11:24:51 -08:00
Brian Behlendorf
4f5d567cfd
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2008-12-11 11:24:45 -08:00
Brian Behlendorf
3420896332
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2008-12-11 11:24:42 -08:00
Brian Behlendorf
172bb4bd5e
Move the world out of /zfs/ and seperate out module build tree
2008-12-11 11:08:09 -08:00