Brian Behlendorf
3eb4ba3ebd
Add 3 more uninit errors detected by gcc 3.4.0 compiler.
2009-03-16 16:06:50 -07:00
Brian Behlendorf
ac0ed2b141
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-03-16 10:42:55 -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
caba3cb67e
Update specific asm-* arch to generic i386.
...
Depending on your x86 architecture $target_cpu can evaluate to
any of the following (i386|i486|i586|i686). Since our local asm
uses only i386 instructions sed is used to map all of these to
i386 and sets $target_arch. Other arch's are not impacted.
2009-03-13 09:41:55 -07:00
Brian Behlendorf
640eb1d542
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-03-12 15:47:07 -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
574ed0e0b7
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-03-12 15:29:01 -07:00
Brian Behlendorf
379d9cf34d
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-12 15:26:15 -07:00
Brian Behlendorf
6a59551cb7
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2009-03-12 15:26:13 -07:00
Brian Behlendorf
c4e10eb3df
Merge branch 'fix-strncat' into refs/top-bases/fix-branch
2009-03-12 15:21:30 -07:00
Brian Behlendorf
f1f9c50dd9
Add fix-strncat branch which corrects a buffer overrun.
2009-03-12 15:20:26 -07:00
Brian Behlendorf
0a6d02c2b9
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-03-12 15:15:08 -07:00
Brian Behlendorf
f2e7d57653
Packaging update
...
Make LINUX_VERSION available to Makefile's, add packaging
for user space include headers.
2009-03-12 15:07:29 -07:00
Brian Behlendorf
59541a305e
Libspl XDR implementation reorganization
...
Moved xdr_control() function from static inline in xdr.h in to a
new xdr.c file which was added to the libspl build. Additionally,
I have removed the 'xdr_bytesrec' typedef which shares the same
name as the struct. This is what Solaris does, but it's just asking
for trouble. It has been replaced with an 'xdr_bytesrec_t' typedef.
2009-03-12 14:38:52 -07:00
Brian Behlendorf
3d35752b2b
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-03-12 10:40:32 -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
df8e13b5bd
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-03-12 10:03:02 -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
da324afb34
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-03-11 21:02:49 -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
Ricardo M. Correia
db42bfe00a
Fixed compilation error due to missing xdr_control() implementation in Linux.
2009-03-11 14:53:41 -07:00
Brian Behlendorf
962c862580
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-03-11 14:13:07 -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
84b63f7730
Remove all #pragma idents from libspl.
2009-03-11 12:13:44 -07:00
Brian Behlendorf
3a23753b70
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-03-11 11:20:30 -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
Ricardo M. Correia
4a118b6227
Minor bug fix due to MAXOFFSET_T constant being too large on 32-bit systems.
2009-03-11 10:47:20 -07:00
Brian Behlendorf
c05c1aa6f9
Build system and packaging (RPM support) (Part 4)
...
Complete support for dist install srpm and rpm make targets.
2009-03-10 21:57:56 -07:00
Brian Behlendorf
7ca5d85ab6
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-03-10 21:30:24 -07:00
Brian Behlendorf
c8e569dd1c
Build system and packaging (RPM support) (Part 2)
...
Complete support for dist install srpm and rpm make targets.
2009-03-10 21:13:30 -07:00
Brian Behlendorf
2cd31b723e
Add HW_HOSTID_LEN for libspl use
2009-02-18 16:00:50 -08:00
Brian Behlendorf
5164741b40
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-02-18 15:23:29 -08:00
Brian Behlendorf
830ac5b109
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-02-18 15:20:11 -08:00
Brian Behlendorf
6f8f3b5532
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-02-18 15:20:10 -08:00
Brian Behlendorf
9d4d22a26e
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
2009-02-18 15:20:08 -08:00
Brian Behlendorf
8c228734a3
Fix cast
2009-02-18 15:15:56 -08:00
Brian Behlendorf
181fd4addc
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-02-18 14:37:16 -08: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
109a1d5b16
Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs
2009-02-18 14:28:38 -08:00
Brian Behlendorf
6fe19bd252
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
...
Conflicts:
lib/libzpool/kernel.c
module/zfs/arc.c
2009-02-18 14:28:15 -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
3eb7fa9afd
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
2009-02-18 14:04:08 -08:00
Brian Behlendorf
5be9e325a1
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
...
Conflicts:
module/zfs/arc.c
2009-02-18 14:03:22 -08:00
Brian Behlendorf
ba528721da
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
2009-02-18 13:12:58 -08:00
Brian Behlendorf
0b8e48b813
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
2009-02-18 13:12:53 -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
389b037e7a
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-01-15 14:22: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
48a55a0a10
Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs
2009-01-15 14:13:54 -08:00
Brian Behlendorf
551838a6c8
Resolve conflict with removed cleaner type
2009-01-15 14:13:39 -08:00
Brian Behlendorf
da7151a89e
Resolve conflict with removed cleaner type
2009-01-15 14:11:19 -08:00
Brian Behlendorf
7b54fe44dc
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
2009-01-15 14:05:38 -08:00
Brian Behlendorf
977fef2ba7
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
2009-01-15 14:05:32 -08:00
Brian Behlendorf
2f36bf5af4
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
2009-01-15 14:05:29 -08:00
Brian Behlendorf
35a269c06c
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
2009-01-15 14:05:26 -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
3764ec0e1e
Fixed sizeof() issue and minor cleanup
2009-01-14 12:03:03 -08:00
Brian Behlendorf
b8fc1110d1
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-01-09 15:11:48 -08:00
Brian Behlendorf
6791a1ee34
I don't think we need this in userspace
2009-01-09 15:07:32 -08:00
Brian Behlendorf
7af644b8b3
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-01-09 14:46:32 -08:00
Brian Behlendorf
ff09d64647
Pull all source in to be built, it will be ifdef'ed out as need by higher level topic branches
2009-01-09 14:37:45 -08:00
Brian Behlendorf
eba9726539
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-01-08 10:29:13 -08:00
Brian Behlendorf
b457fb49f9
Remove vdev_disk from userspace build, vdev_file is used
2009-01-08 10:23:59 -08:00
Brian Behlendorf
889bb92210
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-01-05 13:47:21 -08:00
Brian Behlendorf
c15fa0ceb0
Add include paths
2009-01-05 13:44:26 -08:00
Brian Behlendorf
0f742dfc96
Refresh context
2009-01-05 12:45:17 -08:00
Brian Behlendorf
ce7115b807
Add unicode makefile references and support
2009-01-05 12:33:09 -08:00
Brian Behlendorf
ced77c2f1b
Add unicode makefile references and support
2009-01-05 12:32:55 -08:00
Brian Behlendorf
3d2e086e21
Remove u8 support, moved to libu8
2009-01-05 11:52:51 -08:00
Brian Behlendorf
50735743b7
Err undo that
2008-12-22 16:22:28 -08:00
Brian Behlendorf
bb128e51e6
Use thread so we can add other goodies beyond simply the pthread base
2008-12-22 16:20:36 -08:00
Brian Behlendorf
89585b82fa
Add missing limits
2008-12-22 15:17:57 -08:00
Brian Behlendorf
091c16c185
Add missing tzfile.h
2008-12-22 15:04:47 -08:00
Brian Behlendorf
b0704f1597
Add missing header for ztest
2008-12-22 14:57:15 -08:00
Brian Behlendorf
ef6c136edb
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2008-12-22 14:45:33 -08:00
Brian Behlendorf
29b47d366e
Remove some headers
2008-12-22 14:42:02 -08:00
Brian Behlendorf
fa078fa9dd
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2008-12-22 13:52:53 -08:00
Brian Behlendorf
90e5216ea9
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-22 13:51:17 -08:00
Brian Behlendorf
035e4d373e
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2008-12-22 13:51:16 -08:00
Brian Behlendorf
c9597f9a4f
Merge branch 'fix-pthreads' into refs/top-bases/fix-branch
2008-12-22 13:51:15 -08:00
Brian Behlendorf
6bed331e59
More compat changes
2008-12-22 13:47:58 -08:00
Brian Behlendorf
57e03b4986
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2008-12-22 12:54:57 -08:00
Brian Behlendorf
121effcbee
Pull everything in to the Makefile
2008-12-22 12:51:03 -08:00
Brian Behlendorf
d7fafdb56e
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2008-12-22 11:42:23 -08:00
Brian Behlendorf
7047bb0678
Add missing files from Makefile.am
2008-12-22 11:36:48 -08:00
Brian Behlendorf
4e564d755b
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2008-12-22 10:37:42 -08:00
Brian Behlendorf
5f0a629790
Add enable_extended_FILE_stdio #define
2008-12-22 10:34:22 -08:00
Brian Behlendorf
10911f9d71
Add missing sources
2008-12-22 10:27:41 -08:00
Brian Behlendorf
e8b703cb46
Add sys/time.h
2008-12-22 10:00:01 -08:00
Brian Behlendorf
6d9b733aab
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2008-12-19 16:57:43 -08:00
Brian Behlendorf
60289ccd8f
Add zfs_byteswap
2008-12-19 16:51:14 -08:00
Brian Behlendorf
ae21fcad1c
Add missing acl files
2008-12-19 16:49:31 -08:00
Brian Behlendorf
252ef2053c
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2008-12-19 16:36:02 -08:00
Brian Behlendorf
96813619bf
Pull in new background scrubber
2008-12-19 16:29:13 -08:00
Brian Behlendorf
50c5923533
Resolve lingering atomic asm build issues. I think
2008-12-19 16:23:26 -08:00
Brian Behlendorf
0581ade42b
Add target_cpu
2008-12-19 16:07:26 -08:00
Brian Behlendorf
b66eafc892
Add assembler flags
2008-12-19 15:56:04 -08:00
Brian Behlendorf
febd743891
First pass at getting userspace 64bit atomic ops working:
2008-12-19 15:11:43 -08:00
Brian Behlendorf
545f76d526
Add P2BOUNDARY macro
2008-12-19 13:56:55 -08:00
Brian Behlendorf
d6013ca22b
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2008-12-19 13:38:47 -08:00
Brian Behlendorf
8ab575cd8e
Remove vdev_disk.c from userspace build, we simply use vdev_file.c here
2008-12-19 13:35:29 -08:00
Brian Behlendorf
28edfc91c8
Add compress header
2008-12-19 13:14:49 -08:00
Brian Behlendorf
b86297e4d3
Add missing umem bits
2008-12-19 12:32:08 -08:00
Brian Behlendorf
55c0063df6
Add 2 more headers where are missing
2008-12-19 12:18:59 -08:00
Brian Behlendorf
87dc99c933
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2008-12-19 12:11:09 -08:00
Brian Behlendorf
e485017676
Remove spa_boot from userspace build
2008-12-19 12:04:45 -08:00
Brian Behlendorf
f72a142146
Strip out sunddi support, this can be done in context
2008-12-19 12:04:07 -08:00
Brian Behlendorf
273cbc844a
Fix trailing 'a' char
2008-12-19 11:55:38 -08:00
Brian Behlendorf
f9a746f44f
Flesh out some more of the sunddi
2008-12-19 11:48:21 -08:00
Brian Behlendorf
615168d176
Stub out additional sunddi interfaces
2008-12-19 11:30:42 -08:00
Brian Behlendorf
ce80c4a422
Add utsname.h header
2008-12-19 11:13:07 -08:00
Brian Behlendorf
08ecd85f89
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2008-12-19 10:19:53 -08:00
Brian Behlendorf
9de4108779
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-19 10:18:12 -08:00
Brian Behlendorf
3e2e5c4535
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2008-12-19 10:18:12 -08:00
Brian Behlendorf
a68af79057
Merge branch 'fix-pthreads' into refs/top-bases/fix-branch
2008-12-19 10:18:11 -08:00
Brian Behlendorf
d4c39af7a6
Re-add KM_PUSHPAGE
2008-12-19 10:15:52 -08:00
Brian Behlendorf
330840ff2e
Re-add KM_PUSHPAGE
2008-12-19 10:15:27 -08:00
Brian Behlendorf
75b98b396b
Add missing VM types
2008-12-19 10:09:35 -08:00
Brian Behlendorf
8578673221
Add DTRACE_PROBE(a) macro
2008-12-19 10:01:38 -08:00
Brian Behlendorf
fa6f423f31
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2008-12-19 09:54:43 -08:00
Brian Behlendorf
2d0ae2710c
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-19 09:52:53 -08:00
Brian Behlendorf
5906903384
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2008-12-19 09:52:52 -08:00
Brian Behlendorf
3d8832a795
Merge branch 'fix-pthreads' into refs/top-bases/fix-branch
2008-12-19 09:52:51 -08:00
Brian Behlendorf
3bc48c3e74
Missing func readd
2008-12-19 09:50:15 -08:00
Brian Behlendorf
111303eeb8
context
2008-12-19 09:47:09 -08:00
Brian Behlendorf
dbc567603d
Readd removed hunk
2008-12-19 09:39:17 -08:00
Brian Behlendorf
cdcb2af79b
Add proper header
2008-12-19 09:30:56 -08:00
Brian Behlendorf
a1e023d7a4
Add strtoxx functions
2008-12-19 09:05:50 -08:00
Brian Behlendorf
acfcb00a6e
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2008-12-18 13:20:04 -08:00
Brian Behlendorf
72bf32a79f
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-18 13:18:19 -08:00
Brian Behlendorf
844a9ced6d
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2008-12-18 13:18:17 -08:00
Brian Behlendorf
33e499be43
Merge branch 'fix-stack' into refs/top-bases/fix-branch
2008-12-18 13:18:15 -08:00
Brian Behlendorf
8e136cf0c9
Add noinline macro for userspace
2008-12-18 13:15:58 -08:00
Brian Behlendorf
16dc43525b
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2008-12-18 10:03:15 -08:00
Brian Behlendorf
0a353443cd
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-18 10:01:41 -08:00
Brian Behlendorf
9c0846462b
Resolve conflict
2008-12-18 10:01:37 -08:00
Brian Behlendorf
4df7b421a1
Merge branch 'fix-pthreads' into refs/top-bases/fix-branch
2008-12-18 10:00:46 -08:00
Brian Behlendorf
25a3fca866
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-18 10:00:45 -08:00
Brian Behlendorf
9e195d0cbf
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
2008-12-18 10:00:44 -08:00
Brian Behlendorf
c8f253cda8
Now fixed in fix-pthreads branch
2008-12-18 09:58:42 -08:00
Brian Behlendorf
229aba2943
Properly cast thread functions for pthreads
2008-12-18 09:56:22 -08:00
Brian Behlendorf
893ed2fad0
Properly cast thread functions for pthreads
2008-12-18 09:56:05 -08:00
Brian Behlendorf
5915f86ab1
Add callb.h header
2008-12-18 09:38:10 -08:00
Brian Behlendorf
c90836a39f
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2008-12-17 16:47:17 -08:00
Brian Behlendorf
f799177730
Add all sources for libzfs userspace funcationality
2008-12-17 16:39:45 -08:00
Brian Behlendorf
0f7520c7b0
Add gethrtime
2008-12-17 16:04:10 -08:00
Brian Behlendorf
e3150dafb7
Add getexecname to Makefile.am
2008-12-17 14:34:48 -08:00
Brian Behlendorf
370f0a1773
Add zone and getmntany sources
2008-12-17 14:14:23 -08:00
Brian Behlendorf
c1e34481d8
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2008-12-17 13:38:38 -08:00
Brian Behlendorf
ba3d5afa54
Add missing \
2008-12-17 13:35:06 -08:00
Brian Behlendorf
33b73cd800
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2008-12-17 11:37:48 -08:00
Brian Behlendorf
5ea99efac7
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-17 11:36:20 -08:00
Brian Behlendorf
676ab35598
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2008-12-17 11:36:19 -08:00
Brian Behlendorf
0106dabb11
Merge branch 'fix-pthreads' into refs/top-bases/fix-branch
2008-12-17 11:36:18 -08:00
Brian Behlendorf
a681d70e28
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-17 11:36:17 -08:00
Brian Behlendorf
e532f6bef4
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2008-12-17 11:36:16 -08:00
Brian Behlendorf
8af904a4b0
Resolve index shadowing /usr/include/string.h:304
2008-12-17 11:34:19 -08:00
Brian Behlendorf
ed9a35324d
Not sure why Sun needed to remove these externs, but I need them back
2008-12-17 11:32:47 -08:00
Brian Behlendorf
d8a55bcb89
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2008-12-17 11:28:46 -08:00
Brian Behlendorf
25db7e9413
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-17 11:27:21 -08:00
Brian Behlendorf
935fd6c681
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-17 11:27:20 -08:00
Brian Behlendorf
55c8582174
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2008-12-17 11:27:19 -08:00
Brian Behlendorf
dcf0fb9ffb
Resolve shadow conflicts
2008-12-17 11:25:21 -08:00
Brian Behlendorf
e5191c5ed5
Resolve conflict
2008-12-17 11:19:19 -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
4291b2e02f
Add locale.h
2008-12-17 10:43:06 -08:00
Brian Behlendorf
e23605530a
Update #ifndef/#defines
2008-12-17 10:10:32 -08:00
Brian Behlendorf
6d524f2906
Cleanup some of the #ifndef/#defines
2008-12-17 10:06:55 -08:00
Brian Behlendorf
07394c4b64
Add mkdev.h rename _SOL_SYS to _LIBSPL_SYS
2008-12-17 10:04:04 -08:00
Brian Behlendorf
5945ae3161
Move verify/assert userspace functionality to libspl to simply everything, this way it only lives in one place where you need to build with libzfs.h or zfs_context.h
2008-12-17 09:43:11 -08:00
Brian Behlendorf
8ad2f7697a
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2008-12-16 16:38:48 -08:00
Brian Behlendorf
7453ec0f2c
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-16 16:34:09 -08:00
Brian Behlendorf
8bed8da925
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-16 16:34:07 -08:00
Brian Behlendorf
2d7f255945
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2008-12-16 16:34:04 -08:00
Brian Behlendorf
ebab24f633
Resolve shadow conflict
2008-12-16 16:26:50 -08:00
Brian Behlendorf
3d34904fbb
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2008-12-16 16:22:34 -08:00
Brian Behlendorf
f2bc2f7b6f
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-16 16:19:52 -08:00
Brian Behlendorf
fd4da48000
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-16 16:19:50 -08:00
Brian Behlendorf
29be0d44ba
Resolve conflict
2008-12-16 16:19:46 -08:00
Brian Behlendorf
4d21a1c977
Resolve two more shadow conflicts
2008-12-16 16:14:19 -08:00
Brian Behlendorf
1f5373d772
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2008-12-16 15:52:46 -08:00
Brian Behlendorf
12c13fbafb
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-16 15:51:20 -08:00
Brian Behlendorf
4583b6d5ba
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-16 15:51:19 -08:00
Brian Behlendorf
e14e140b52
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2008-12-16 15:51:19 -08:00
Brian Behlendorf
3c515284a6
Remove double declaration of char *
2008-12-16 15:49:21 -08:00
Brian Behlendorf
f73c835830
Add include patch to pick up fletcher.c which for some unknown reason is included instead of simply being build as source. This should be fixed eventually, but it is how the OpenSolaris source handles it.
2008-12-16 15:44:02 -08:00
Brian Behlendorf
a3ea268b72
Add 2 missing headers
2008-12-16 15:20:56 -08:00
Brian Behlendorf
66cf9db3d0
Remove non-existing systeminfo ref
2008-12-16 14:38:52 -08:00
Brian Behlendorf
dbd5e397c5
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2008-12-16 14:35:20 -08:00
Brian Behlendorf
79bc1b23ed
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-16 14:33:59 -08:00
Brian Behlendorf
804830a231
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-16 14:33:59 -08:00
Brian Behlendorf
a8a0f9ea2a
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2008-12-16 14:33:58 -08:00
Brian Behlendorf
9439fbdcd3
Add systeminfo
2008-12-16 14:32:03 -08:00
Brian Behlendorf
53c0cdbc42
Resolve dirname shadow conflict with /usr/include/libgen.h:27 dirname
2008-12-16 14:29:35 -08:00
Brian Behlendorf
7df95c2f31
Add missing header
2008-12-16 14:22:31 -08:00
Brian Behlendorf
f6207ec73a
Add missing headers
2008-12-16 14:17:29 -08:00
Brian Behlendorf
9df591c9d3
Add sys/mount.h header
2008-12-16 14:10:43 -08:00
Brian Behlendorf
ac3a2f3476
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2008-12-16 13:31:42 -08:00
Brian Behlendorf
527e38c72b
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-16 13:30:21 -08:00
Brian Behlendorf
34b937c016
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-16 13:30:21 -08:00
Brian Behlendorf
f693a600d0
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2008-12-16 13:30:20 -08:00
Brian Behlendorf
206a3ac58c
Resolve 2 more shadow conflicts
2008-12-16 13:28:23 -08:00
Brian Behlendorf
e329093faf
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2008-12-16 13:22:44 -08:00
Brian Behlendorf
60ad9afc28
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-16 13:21:23 -08:00
Brian Behlendorf
5af8235e41
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-16 13:21:23 -08:00
Brian Behlendorf
f82621d7cb
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2008-12-16 13:19:26 -08:00
Brian Behlendorf
5383875500
Create gcc-shadow branch
2008-12-16 13:19:01 -08:00
Brian Behlendorf
e518437bbe
Add 3 missing headers
2008-12-16 09:54:42 -08:00
Brian Behlendorf
4d6a2499f6
Minor update to assert, pull include_next out of ifdef
2008-12-16 09:35:40 -08:00
Brian Behlendorf
b0b1c43c46
Add += for DEFAULT_INCLUDES
2008-12-16 09:08:43 -08:00
Brian Behlendorf
eb2a7c5200
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2008-12-16 09:06:37 -08:00
Brian Behlendorf
a7b063d224
Add DEFAULT_INCLUDE to rules, adjust = to += accordingly
2008-12-16 08:58:41 -08:00
Brian Behlendorf
b74b9388b9
Add zfs_config include
2008-12-16 08:44:37 -08:00
Brian Behlendorf
5a17b1401d
Add unistd.h include config magic
2008-12-15 10:00:43 -08:00
Brian Behlendorf
228b31e100
Add va_list include
2008-12-15 09:27:38 -08:00
Brian Behlendorf
e1357f07c0
Add libshare.h stub
2008-12-15 09:10:33 -08:00
Brian Behlendorf
b35bef8df2
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2008-12-12 16:29:31 -08:00
Brian Behlendorf
0e8ac26fc9
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-12 16:23:07 -08:00
Brian Behlendorf
08a8860091
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2008-12-12 16:23:04 -08:00
Brian Behlendorf
eee73dd80e
Merge branch 'fix-pthreads' into refs/top-bases/fix-branch
2008-12-12 16:22:59 -08:00
Brian Behlendorf
d0c573f27e
Add in the reset of the pthread changes
2008-12-12 16:16:06 -08:00