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
d57bb8312d
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-03-11 12:22:30 -07:00
84b63f7730
Remove all #pragma idents from libspl.
2009-03-11 12:13:44 -07:00
3a23753b70
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-03-11 11:20:30 -07:00
3cc7a2814d
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2009-03-11 11:18:23 -07:00
7a08ef9d52
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
...
Conflicts:
module/zfs/spa_boot.c
2009-03-11 11:17:23 -07:00
47e0037a8b
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-03-11 11:15:59 -07:00
bf200630f9
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
...
Conflicts:
module/zfs/rrwlock.c
module/zfs/spa_boot.c
module/zfs/zfs_replay.c
2009-03-11 11:12:24 -07:00
dff484a388
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-11 11:09:13 -07:00
5f30a3cb0e
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-03-11 11:09:11 -07:00
8fe801fd8f
Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch
2009-03-11 11:00:42 -07:00
af45030850
Added 'gcc-ident-pragmas' branch.
2009-03-11 10:59:45 -07:00
0c8622c47c
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-03-11 10:55:05 -07:00
4a118b6227
Minor bug fix due to MAXOFFSET_T constant being too large on 32-bit systems.
2009-03-11 10:47:20 -07:00
2d37cf7361
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-03-10 22:03:01 -07:00
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
7ca5d85ab6
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-03-10 21:30:24 -07:00
f65339a529
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2009-03-10 21:27:34 -07:00
e610bf6e09
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-03-10 21:26:59 -07:00
64c77b5cdb
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-03-10 21:26:14 -07:00
36860ec1a8
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
...
Conflicts:
module/Makefile.in
2009-03-10 21:23:17 -07:00
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
da2df72c28
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-02-18 16:06:49 -08:00
2cd31b723e
Add HW_HOSTID_LEN for libspl use
2009-02-18 16:00:50 -08:00
5164741b40
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-02-18 15:23:29 -08:00
03f8c8f94b
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2009-02-18 15:22:04 -08:00
b878be0ee1
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-02-18 15:21:35 -08:00
e77f9a10a9
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-02-18 15:20:53 -08:00
e60db6f9dd
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-02-18 15:20:14 -08:00
830ac5b109
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-02-18 15:20:11 -08:00
6f8f3b5532
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-02-18 15:20:10 -08:00
9d4d22a26e
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
2009-02-18 15:20:08 -08:00
8c228734a3
Fix cast
2009-02-18 15:15:56 -08:00
181fd4addc
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-02-18 14:37:16 -08:00
a278e153c4
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2009-02-18 14:35:20 -08:00
9f4865e4ca
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-02-18 14:34:45 -08:00
f78c15d84f
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-02-18 14:34:03 -08:00
8090a9a908
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
...
Conflicts:
cmd/zpool/zpool_main.c
2009-02-18 14:31:46 -08:00
7872d84be6
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-02-18 14:30:54 -08:00
15f5ddebdf
Merge commit 'refs/top-bases/fix-pthreads' into fix-pthreads
...
Conflicts:
lib/libzpool/kernel.c
2009-02-18 14:29:08 -08:00
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
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
5be9e325a1
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
...
Conflicts:
module/zfs/arc.c
2009-02-18 14:03:22 -08:00
ba528721da
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
2009-02-18 13:12:58 -08:00
0b8e48b813
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
2009-02-18 13:12:53 -08:00
e203e7b48f
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
2009-02-18 13:12:35 -08:00
f686a87058
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
...
Conflicts:
module/zfs/arc.c
2009-02-18 13:12:26 -08:00
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
d164b20935
Rebase master to b108
2009-02-18 12:51:31 -08:00
27e7565a93
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2009-02-03 09:46:46 -08:00
3d86fad730
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-02-03 09:46:36 -08:00
9cd029b543
Remove mknod from library.
...
This is all nowhandled in the SPL. When HAVE_GPL_ONLY_SYMBOLS is defined
because the module license is set to GPL we can leverage the udev interfaces
which will create the device. When HAVE_GPL_ONLY_SYMBOLS is not defined
we resort to an ugly hack and the SPL invokes a usermode helper to create
to missing device file for us in /dev/. Using GPL version modules is off
course preperable when possible.
2009-02-03 09:38:53 -08:00
ca804c66f8
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
2009-01-16 14:55:26 -08:00
7c5b7d2a94
This should always be success when zvol support is disabled
2009-01-16 14:52:35 -08:00
389b037e7a
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-01-15 14:22:01 -08:00
476261f2d5
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-01-15 14:21:18 -08:00
2c83372734
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2009-01-15 14:21:11 -08:00
091a4a4ca4
Resolve conflict with removed cleaner type
2009-01-15 14:20:49 -08:00
cb8e50168e
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-01-15 14:19:06 -08:00
1f372d9030
Resolve conflict with removed cleaner type
2009-01-15 14:18:01 -08:00
ddaad20220
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-15 14:16:23 -08:00
a42707fcc0
Resolve conflict with removed cleaner type
2009-01-15 14:16:03 -08:00
551838a6c8
Resolve conflict with removed cleaner type
2009-01-15 14:13:39 -08:00
da7151a89e
Resolve conflict with removed cleaner type
2009-01-15 14:11:19 -08:00
977fef2ba7
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
2009-01-15 14:05:32 -08:00
2f36bf5af4
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
2009-01-15 14:05:29 -08:00
35a269c06c
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
2009-01-15 14:05:26 -08:00
a2e601c6e3
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
2009-01-15 14:04:39 -08:00
3fa768e21b
Resolve conflict with removed cleaner type
2009-01-15 14:04:35 -08:00
d3df6b2012
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2009-01-15 14:01:51 -08:00
fb5f0bc833
Rebase master to b105
2009-01-15 13:59:39 -08:00
aff2252263
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2009-01-14 14:27:42 -08:00
fd93449de9
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-01-14 14:27:31 -08:00
4fdb04d0a1
A little hackery to handle using zdb when the module stack isn't loaded. This is a hack and should be addressed upstream, zdb should not be attempting to initialize services it doesn't need
2009-01-14 14:25:25 -08:00
e6746c2609
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-01-14 12:06:41 -08:00
3764ec0e1e
Fixed sizeof() issue and minor cleanup
2009-01-14 12:03:03 -08:00
97073208f8
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
2009-01-14 10:42:45 -08:00
bdde0d9d40
Return success here not failure
2009-01-14 10:37:35 -08:00
7f9ce14e58
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2009-01-13 09:55:40 -08:00
09b6f64e2d
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-01-13 09:55:30 -08:00
ef6d827a88
Don't check HAVE_SPL unavailable in userspace build
2009-01-13 09:53:35 -08:00
a62a385848
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2009-01-09 16:54:15 -08:00
13ab1d30be
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-01-09 16:53:53 -08:00
e22bfeab4e
Update load/unload message, mknod /dev/zfs when udev is unavailable
2009-01-09 16:50:08 -08:00
402405558a
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-01-09 15:11:56 -08:00
b8fc1110d1
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-01-09 15:11:48 -08:00
e86fa83ee6
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-01-09 15:11:16 -08:00
89cf8c8a67
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2009-01-09 15:11:11 -08:00
aa6c4ff685
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-01-09 15:10:59 -08:00
921ebaf7f7
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-01-09 15:10:43 -08:00
522fb18428
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-01-09 15:10:26 -08:00
6791a1ee34
I don't think we need this in userspace
2009-01-09 15:07:32 -08:00
a7e5f34acb
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-01-09 14:46:41 -08:00
7af644b8b3
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-01-09 14:46:32 -08:00
d584ad239d
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-01-09 14:46:01 -08:00
4022f85bac
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2009-01-09 14:45:56 -08:00
be3a17e437
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-01-09 14:45:45 -08:00
8e1f5d7bec
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-01-09 14:45:29 -08:00
d315fcf28e
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-01-09 14:45:13 -08:00
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
8a6f0ab272
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-01-08 10:29:23 -08:00
eba9726539
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-01-08 10:29:13 -08:00
e1a4af24af
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-01-08 10:28:37 -08:00
a43e0b50fb
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2009-01-08 10:28:32 -08:00
06749d1581
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-01-08 10:28:18 -08:00
c281c15c84
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-01-08 10:28:00 -08:00
b7d9adb500
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-01-08 10:27:42 -08:00
b457fb49f9
Remove vdev_disk from userspace build, vdev_file is used
2009-01-08 10:23:59 -08:00
77c4ef21ab
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-01-05 13:47:29 -08:00
889bb92210
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-01-05 13:47:21 -08:00
dbcb8f3921
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-01-05 13:46:51 -08:00
a9bfb78b5a
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2009-01-05 13:46:47 -08:00
3bc01c0326
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-01-05 13:46:35 -08:00
f88ab3c355
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-01-05 13:46:21 -08:00
80ed6c342d
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-01-05 13:46:06 -08:00
c15fa0ceb0
Add include paths
2009-01-05 13:44:26 -08:00
35cfc1bb85
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-01-05 12:45:38 -08:00
0f742dfc96
Refresh context
2009-01-05 12:45:17 -08:00
d5350109f4
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-01-05 12:40:55 -08:00
6ce317a8d5
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2009-01-05 12:40:48 -08:00
9c2bf69ecb
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-01-05 12:40:25 -08:00
c8fa7c9b23
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-01-05 12:39:56 -08:00
9a0cb95b1b
Resolve conflict
2009-01-05 12:38:23 -08:00
ce7115b807
Add unicode makefile references and support
2009-01-05 12:33:09 -08:00
ced77c2f1b
Add unicode makefile references and support
2009-01-05 12:32:55 -08:00
1b327abcfd
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-01-05 11:54:52 -08:00
3d2e086e21
Remove u8 support, moved to libu8
2009-01-05 11:52:51 -08:00
50735743b7
Err undo that
2008-12-22 16:22:28 -08:00
bb128e51e6
Use thread so we can add other goodies beyond simply the pthread base
2008-12-22 16:20:36 -08:00
53f2b61ce1
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2008-12-22 15:21:10 -08:00
89585b82fa
Add missing limits
2008-12-22 15:17:57 -08:00
3251158230
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2008-12-22 15:06:42 -08:00
091c16c185
Add missing tzfile.h
2008-12-22 15:04:47 -08:00
314e57ba29
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2008-12-22 14:59:06 -08:00
b0704f1597
Add missing header for ztest
2008-12-22 14:57:15 -08:00
97e7199aaf
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2008-12-22 14:45:43 -08:00
ef6c136edb
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2008-12-22 14:45:33 -08:00
12573fb5b9
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-22 14:44:59 -08:00
c267d86b09
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-22 14:44:55 -08:00
16d3bec487
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-22 14:44:42 -08:00
997a274a13
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2008-12-22 14:44:25 -08:00
ff8a2f61ff
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-22 14:44:07 -08:00
29b47d366e
Remove some headers
2008-12-22 14:42:02 -08:00
139792e6b2
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2008-12-22 13:53:03 -08:00
fa078fa9dd
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2008-12-22 13:52:53 -08:00
262e367cd5
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-22 13:52:16 -08:00
877699acb1
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-22 13:52:11 -08:00
1f72057409
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-22 13:51:57 -08:00
52bfcda357
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2008-12-22 13:51:39 -08:00
05fafc638f
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-22 13:51:21 -08:00
Brian Behlendorf
Ricardo M. Correia