a3c2fb2333
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
2010-04-29 10:41:02 -07:00
3bd5ecf4a7
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
2010-04-29 10:41:00 -07:00
530d9b5702
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
2010-04-29 10:40:57 -07:00
c3da525f25
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
2010-04-29 10:40:54 -07:00
1655c9c76f
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
2010-04-29 10:40:51 -07:00
097e1158e6
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
2010-04-29 10:40:48 -07:00
d5dbdb4fe2
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
2010-04-29 10:40:38 -07:00
8c24800b72
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2010-04-29 10:40:36 -07:00
4aad8d3244
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2010-04-29 10:40:34 -07:00
fa42225a3d
Add Solaris FMA style support
2010-04-29 10:37:15 -07:00
13d740f8fa
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-03-09 13:25:29 -08:00
19eef8ad39
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-03-09 13:24:30 -08:00
9fa502c50b
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2010-03-09 13:24:29 -08:00
e218fd13e8
Merge commit 'refs/top-bases/feature-branch' into feature-branch
2010-03-09 13:24:28 -08:00
ef359aee66
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
2010-03-09 13:24:27 -08:00
f2ab1fea36
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
2010-03-09 13:24:27 -08:00
2b85024275
Use CPU percentages for number of commit cb threads.
...
This doesn't change number of threads in the kernel, but it reduces number of
threads in ztest (important due to 32-bit address limitations).
2010-03-09 13:21:20 -08:00
bd96142642
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-03-09 12:31:11 -08:00
8f63d438cd
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-03-09 12:30:18 -08:00
48e74ed68b
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
...
Conflicts:
cmd/ztest/ztest.c
2010-03-09 12:30:03 -08:00
9a3d5378c6
Clean up emulation of kernel threads in userspace.
...
Updated to use pthread thread specific data rather than keeping
a global list. This also fixes at least one easily reproducible
crash in ztest
2010-03-09 12:25:28 -08:00
96904978f8
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-03-09 10:31:19 -08:00
3a9850385c
Include all headers regardless of depth
...
The previous hack for this was to move headers 3 levels deep in to
the top level include dir and headers 4 levels deep in to sys.
Obviously this was fairly limiting and missed two important headers.
./zfs/include/sys/fm/fs/zfs.h
./zfs/include/sys/fs/zfs.h
This patch updates the code to be smarter and installs all the headers
to the correct location regardless of depth. Each header will have its
leading 3 path args stripped (i.e. ./zfs/include/) and replaced with
the correct install destination. All path information past the first
three levels will be preserved.
2010-03-09 10:20:34 -08:00
7fdea1e32f
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-03-08 13:48:30 -08:00
3d7cfde000
Remove Module.markers and Module.symver{s} in clean target
...
Split 'modules' and 'clean' Makefile targets to allow us to
cleanly remove the Module.* build products with a 'make clean'.
2010-03-08 13:45:51 -08:00
cd66df7819
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-01-08 11:40:10 -08:00
303d9f010d
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-01-08 11:39:31 -08:00
710e779a08
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
2010-01-08 11:39:30 -08:00
a240c39095
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2010-01-08 11:39:29 -08:00
ee3aa7773b
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2010-01-08 11:39:28 -08:00
eaf2e3231c
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
2010-01-08 11:39:28 -08:00
259647c1f1
Merge commit 'refs/top-bases/fix-taskq' into fix-taskq
2010-01-08 11:39:23 -08:00
385839654a
Merge commit 'refs/top-bases/fix-stack' into fix-stack
2010-01-08 11:39:22 -08:00
365c47de76
Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t
2010-01-08 11:39:18 -08:00
68fc990a4b
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
2010-01-08 11:39:16 -08:00
8513efcadd
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
2010-01-08 11:39:16 -08:00
c1d363770f
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
2010-01-08 11:39:16 -08:00
6cb71e1dec
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2010-01-08 11:39:14 -08:00
ad95bcb285
Merge commit 'refs/top-bases/gcc-missing-braces' into gcc-missing-braces
2010-01-08 11:39:12 -08:00
e6f83f6a79
Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas
2010-01-08 11:39:11 -08:00
cdbe3032eb
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
2010-01-08 11:39:09 -08:00
adb3a3deec
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
2010-01-08 11:39:08 -08:00
519a66c6ef
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
2010-01-08 11:39:07 -08:00
d48b3a8869
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
2010-01-08 11:39:06 -08:00
19982171a8
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
2010-01-08 11:39:05 -08:00
aeb5db5cbc
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
2010-01-08 11:39:04 -08:00
8d4f979e7f
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
2010-01-08 11:39:01 -08:00
69804965e9
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2010-01-08 11:39:00 -08:00
e69572c1b5
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2010-01-08 11:39:00 -08:00
4cd8e49a69
Add .gitignore files to exclude build products
2010-01-08 11:35:17 -08:00
10799d975e
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-12-18 14:32:17 -08:00
93b5403a64
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2009-12-18 14:31:22 -08:00
1a36b0ada1
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-12-18 14:31:22 -08:00
b58747a2e2
Merge branch 'fix-stack' into refs/top-bases/fix-branch
2009-12-18 14:31:21 -08:00
70ddc1393f
No inline to keep dmu_recv_stream() stack frame less than 1024 bytes.
...
Recent builds against 2.6.31 flagged dmu_recv_stream() as stack heavy.
As a quick simple way to resolve this I'm preventing the inlining of
certain functions which gcc will inline here because this is the only
place they are called. Futher analysis of this function should be
performed to futher reduce its stack usage.
2009-12-18 14:22:02 -08:00
27417de12c
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-12-11 12:08:28 -08:00
acd798cfd4
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-12-11 12:07:23 -08:00
f8d093f69b
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-12-11 12:07:23 -08:00
b76d12a644
Merge branch 'gcc-64bit-constants' into refs/top-bases/gcc-branch
2009-12-11 12:07:22 -08:00
ba7ccf8ccd
Cast to unsigned long long for 32-bit arches
2009-12-11 11:41:04 -08:00
d1aade1c7b
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-11-20 10:31:13 -08:00
cac1bc41dc
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-11-20 10:29:49 -08:00
77c347db31
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-11-20 10:29:48 -08:00
0f315a58bb
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
2009-11-20 10:29:47 -08:00
3191b962f6
Prevent gcc uninit compiler warning in zfs_range_unlock_reader().
2009-11-20 09:59:58 -08:00
bb12b54387
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-11-15 16:28:34 -08:00
d00a0ea8a0
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-11-15 16:27:02 -08:00
71ccaccb2b
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
2009-11-15 16:27:00 -08:00
475e214ce1
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2009-11-15 16:27:00 -08:00
65f6d4b712
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2009-11-15 16:26:58 -08:00
8c5797df77
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
2009-11-15 16:26:58 -08:00
e530326e8f
Merge commit 'refs/top-bases/fix-taskq' into fix-taskq
2009-11-15 16:26:48 -08:00
b57e406dd6
Merge commit 'refs/top-bases/fix-stack' into fix-stack
2009-11-15 16:26:47 -08:00
8d0c0b0782
Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t
2009-11-15 16:26:39 -08:00
dcd4d95764
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
2009-11-15 16:26:37 -08:00
00f3dfb5e9
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
2009-11-15 16:26:36 -08:00
e57bf40c98
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
2009-11-15 16:26:36 -08:00
59cbe87375
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-11-15 16:26:31 -08:00
ed1f75364a
Merge commit 'refs/top-bases/gcc-missing-braces' into gcc-missing-braces
2009-11-15 16:26:26 -08:00
123728d9ae
Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas
2009-11-15 16:26:23 -08:00
4f9acff2d8
Merge commit 'refs/top-bases/gcc-64bit-constants' into gcc-64bit-constants
2009-11-15 16:26:20 -08:00
b5e7e8a1de
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
2009-11-15 16:26:17 -08:00
26844cb8e1
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
2009-11-15 16:26:14 -08:00
217998d1a3
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
2009-11-15 16:26:12 -08:00
ecdec2a90d
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
2009-11-15 16:26:08 -08:00
56d2a97b3b
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
2009-11-15 16:26:05 -08:00
109d34244d
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
2009-11-15 16:26:02 -08:00
9d03c28169
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
2009-11-15 16:25:53 -08:00
d8aef5d7bc
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2009-11-15 16:25:52 -08:00
030d49c262
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2009-11-15 16:25:50 -08:00
0aa61e8427
Remove zvol.c when updating in update-zfs.sh Linux version available.
2009-11-15 16:20:01 -08:00
0076202c0f
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-08-18 14:21:23 -07:00
e4b55cfbff
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-08-18 14:18:36 -07:00
5d83878f46
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-08-18 14:18:34 -07:00
ef74bed821
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2009-08-18 14:18:32 -07:00
f3ddd9d082
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
2009-08-18 14:18:32 -07:00
8767bb3fdd
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2009-08-18 14:18:31 -07:00
f9a74de46a
Required build 121 updates for gcc-uninit
2009-08-18 14:09:35 -07:00
08f5b3c23d
Required build 121 updates for gcc-shadow
2009-08-18 14:09:15 -07:00
d42b88372f
Required build 121 updates for gcc-c90
2009-08-18 14:07:25 -07:00
917a08a678
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-08-18 12:34:56 -07:00
50c623ccef
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-08-18 12:10:55 -07:00
8aab887b7c
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
2009-08-18 12:10:47 -07:00
5a81224e6f
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2009-08-18 12:10:43 -07:00
bfbac5daec
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
2009-08-18 12:10:38 -07:00
4f6bbcd0e7
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2009-08-18 12:10:36 -07:00
e20ba40c91
Merge commit 'refs/top-bases/fix-taskq' into fix-taskq
2009-08-18 12:10:02 -07:00
f8cca2b295
Merge commit 'refs/top-bases/fix-stack' into fix-stack
2009-08-18 12:09:57 -07:00
e7c05295ca
Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t
2009-08-18 12:09:26 -07:00
b330ab77df
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
2009-08-18 12:09:14 -07:00
d205b25a74
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
2009-08-18 12:09:10 -07:00
25ddaec292
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
2009-08-18 12:09:07 -07:00
b99b422796
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-08-18 12:08:58 -07:00
41b297a27f
Merge commit 'refs/top-bases/gcc-missing-braces' into gcc-missing-braces
2009-08-18 12:08:46 -07:00
abd8fdb94f
Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas
...
Conflicts:
module/zfs/dsl_deleg.c
module/zfs/rrwlock.c
2009-08-18 12:08:36 -07:00
9d2ca4a4d4
Merge commit 'refs/top-bases/gcc-64bit-constants' into gcc-64bit-constants
2009-08-18 12:07:40 -07:00
db89339134
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
...
Conflicts:
module/zfs/dmu.c
2009-08-18 12:07:23 -07:00
3a37442dc7
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
2009-08-18 12:06:53 -07:00
c5b5d32d69
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
...
Conflicts:
module/zfs/vdev_raidz.c
2009-08-18 12:06:21 -07:00
481225606c
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
2009-08-18 12:05:39 -07:00
e95fcbffd9
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
2009-08-18 12:05:33 -07:00
38cc41b5fe
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
2009-08-18 12:05:26 -07:00
9e903015fd
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
2009-08-18 12:05:07 -07:00
e5e4fadc34
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
...
Conflicts:
module/zfs/dmu.c
module/zfs/dsl_deleg.c
module/zfs/rrwlock.c
module/zfs/vdev_raidz.c
2009-08-18 12:04:53 -07:00
0f80e41c89
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
...
Conflicts:
module/zfs/spa_misc.c
module/zfs/vdev_label.c
2009-08-18 11:55:36 -07:00
45d1cae3b8
Rebase master to b121
2009-08-18 11:43:27 -07:00
fe87fabe55
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-08-04 15:57:31 -07:00
f88cbd6535
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-08-04 15:54:21 -07:00
8c28ed9bff
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2009-08-04 15:54:19 -07:00
adcc63f658
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
2009-08-04 15:54:17 -07:00
7069d048a0
Revert kthreads based on pthread thread specific data due to failure.
...
With this patch applied I get the following failure 100% of the time,
I'd prefer to debug it and keep moving forward but I do not have the
time right now so I'm reverting the patch to the version which worked.
Ricardo please fix.
(gdb) bt
0 ztest_dmu_write_parallel (za=0x2aaaac898960) at
../../cmd/ztest/ztest.c:2566
1 0x0000000000405a79 in ztest_thread (arg=<value optimized out>)
at ../../cmd/ztest/ztest.c:3862
2 0x00002b2e6a7a841d in zk_thread_helper (arg=<value optimized out>)
at ../../lib/libzpool/kernel.c:131
3 0x000000379be06367 in start_thread (arg=<value optimized out>)
at pthread_create.c:297
4 0x000000379b2d30ad in clone () from /lib64/libc.so.6
2009-08-04 15:42:24 -07:00
de27eb10c2
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-08-04 14:42:20 -07:00
3e5388907b
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-08-04 14:39:07 -07:00
9aedfd95f6
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2009-08-04 14:39:06 -07:00
0741d789d2
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
2009-08-04 14:39:04 -07:00
c0ce3b40f2
Reimplement user kthreads based on pthread thread specific data.
...
This resolves previous scalabily concerns about the cost of calling
curthread which previously required a list walk. The kthread address
is now tracked as thread specific data which can be quickly returned.
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
2009-08-04 13:55:15 -07:00
56f726d755
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-08-03 16:31:22 -07:00
48cbfae8bd
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-08-03 16:28:49 -07:00
f2f52087f3
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-08-03 16:28:48 -07:00
6cb98ae6b9
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
2009-08-03 16:28:46 -07:00
68a80a8b87
refcount_add() mistakenly moved to ASSERT() breaks --disable-debug builds.
2009-08-03 16:20:27 -07:00
6788f30b27
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-07-29 21:30:18 -07:00
2d86fb2788
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-29 21:27:13 -07:00
3185bb677e
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2009-07-29 21:27:12 -07:00
653cd5153a
Merge branch 'fix-stack' into refs/top-bases/fix-branch
2009-07-29 21:27:10 -07:00
ee435f260c
Excessively large stack frames detected.
...
The 2.6.30 kernel build systems sets -Wframe-larger-than=2048 which causes
a warning to be generated when an individual stack frame exceeds 2048.
This caught the spa_history_log() and dmu_objset_snapshot() functions
which declared a data structure on the stack which contained a char
array of MAXPATHLEN. This in defined to be 4096 in the linux kernel
and I imagine it is quite large under Solaris as well. Regardless, the
offending data structures were moved to the heap to correctly keep the
stack depth to a minimum. We might consider setting this value even
lower to catch additional offenders because we are expecting deep stacks.
2009-07-29 21:18:48 -07:00
fd76ce37c6
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-07-14 14:38:23 -07:00
fef9a2c571
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-14 14:34:39 -07:00
9b9f17a585
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2009-07-14 14:34:37 -07:00
605a501311
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
2009-07-14 14:34:35 -07:00
864e44e7e0
Provide correct kthread API semantics using pthreads.
...
The intent here is to fully remove the previous Solaris thread
implementation so we don't need to simulate both Solaris kernel
and user space thread APIs. The few user space consumers of the
thread API have been updated to use the kthread API. In order
to support this we needed to more fully support the kthread API
and that means not doing crazy things like casting a thread id
to a pointer and using that as was done before. This first
implementation is not effecient but it does provide all the
corrent semantics. If/when performance becomes and issue we
can and should just natively adopt pthreads which is portable.
Let me finish by saying I'm not proud of any of this and I would
love to see it improved. However, this slow implementation does
at least provide all the correct kthread API semantics whereas
the previous method of casting the thread ID to a pointer was
dodgy at best.
2009-07-14 14:16:26 -07:00
d354e6eea1
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-07-10 10:53:51 -07:00
4baa59ce44
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-10 10:50:13 -07:00
cfec48619c
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-07-10 10:50:12 -07:00
84b52133f3
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
2009-07-10 10:50:10 -07:00
f3c55459b0
Pull ; in to macro to ensure it get's entirely removed, C90 issue.
2009-07-10 10:40:55 -07:00
b5c8ae4828
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-07-09 15:11:20 -07:00
24662d61d9
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-09 15:08:06 -07:00
2f4e745a09
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-07-09 15:08:04 -07:00
bed14af385
Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch
2009-07-09 15:08:03 -07:00
ae132945b4
Add suggested paranthesis.
2009-07-09 14:59:10 -07:00
47aea3522c
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-07-09 13:20:57 -07:00
17d368fa5f
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-09 13:17:27 -07:00
a3bc97c2c3
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-07-09 13:17:26 -07:00
9ad0fef49e
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
...
Conflicts:
module/nvpair/nvpair.c
2009-07-09 13:08:30 -07:00
683b2f0d00
TopGit missed this update when I updated the same line in the
...
gcc-unused and gcc-uninit topic branches at the same time and
then ran 'tg update'. I'll need to keep that sort of thing
in mind when updating multiple topic branches between updates.
2009-07-09 13:07:05 -07:00
3aa2e1a105
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-07-09 12:27:13 -07:00
c4c4afd8fd
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-09 12:23:41 -07:00
6db8882b78
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-07-09 12:23:39 -07:00
76bf02aebb
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
2009-07-09 12:23:36 -07:00
a551134b2f
Unitialized variables should be handled in the gcc-uninit topic branch.
2009-07-09 12:14:56 -07:00
a19906fe65
Unitialized variables should be handled in the gcc-uninit topic branch.
2009-07-09 12:13:56 -07:00
f1d99c0653
Revert to original debugging code and wrap any variabled used only
...
within an ASSERT with the ASSERTV macro which will ensure it will
be removed when the ASSERTs are commented out. This makes gcc much
happier, makes the variables usage explicit, and removes the need
for the compiler to detect it is unused and do the right thing.
2009-07-09 12:10:52 -07:00
0ad1fb9f91
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-07-09 10:43:01 -07:00
e5e94c40f7
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-09 10:39:44 -07:00
aa8ed32ee8
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-07-09 10:39:43 -07:00
9e394e10a9
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2009-07-09 10:39:41 -07:00
43af29de5f
Type int accidentally not declared at the top of the function.
2009-07-09 10:19:02 -07:00
0242cb33fe
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-07-08 09:19:31 -07:00
33077ad631
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-08 09:16:05 -07:00
f00e6fe5c3
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-07-08 09:16:04 -07:00
5fc46112cb
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2009-07-08 09:16:01 -07:00
58f5e63293
Resolve a 2 new cases of for loop variable declared in for()
2009-07-08 09:05:37 -07:00
e192fc13d7
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-07-07 16:34:02 -07:00
0a00d10c24
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-07 16:30:57 -07:00
02362668ac
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-07-07 16:30:56 -07:00
24daf7747f
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
2009-07-07 16:30:54 -07:00
0e310d30de
Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch
2009-07-07 16:30:54 -07:00
10dcf485d3
First fit allocator unused comment it out.
2009-07-07 16:23:09 -07:00
ebda366c1c
Add missing case introduced by rebase.
2009-07-07 16:22:33 -07:00
2eeed27184
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-07-07 16:12:13 -07:00
c460e5edb0
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-07 16:09:15 -07:00
04a83f2337
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-07-07 16:09:13 -07:00
55b864f19b
Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch
2009-07-07 16:09:12 -07:00
f80f59f955
Add missing paranthesis for gcc.
2009-07-07 16:01:13 -07:00
aee7b2d2fd
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-07-07 15:53:29 -07:00
e5c8fcd6b0
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-07 15:50:14 -07:00
c75167c985
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-07-07 15:50:13 -07:00
07a6b68575
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
2009-07-07 15:50:11 -07:00
7373ddf55f
hash_lock should always be initialized
2009-07-07 15:41:19 -07:00
49e32fb1f7
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-07-06 15:04:30 -07:00
658459249e
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-06 13:17:28 -07:00
8795d8f034
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2009-07-06 13:15:43 -07:00
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
d369760713
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2009-07-06 13:14:41 -07:00
4539acb1cd
Merge commit 'refs/top-bases/fix-taskq' into fix-taskq
2009-07-06 13:13:25 -07:00
326bb586bd
Merge commit 'refs/top-bases/fix-stack' into fix-stack
2009-07-06 13:13:20 -07:00
eaba5df9af
Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t
2009-07-06 13:12:44 -07:00
5b629493e0
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
2009-07-06 13:12:34 -07:00
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
3ada0935a3
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
2009-07-06 13:11:56 -07:00
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
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
c66757e332
Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch
...
Conflicts:
module/zfs/fletcher.c
2009-07-02 17:07:06 -07:00
a06a428e15
Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas
...
Conflicts:
cmd/zdb/zdb_il.c
cmd/zinject/zinject.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/dmu_object.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_errlog.c
module/zfs/spa_history.c
module/zfs/zap.c
module/zfs/zap_leaf.c
module/zfs/zap_micro.c
2009-07-02 17:06:20 -07:00
bc330e731d
Merge commit 'refs/top-bases/gcc-64bit-constants' into gcc-64bit-constants
2009-07-02 16:59:46 -07:00
244d656e28
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
...
Conflicts:
module/zfs/dmu.c
2009-07-02 16:59:39 -07:00
9550da2ba6
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
...
Conflicts:
module/zfs/arc.c
module/zfs/zio.c
2009-07-02 16:58:33 -07:00
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
eb0137f395
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
...
Conflicts:
lib/libzfs/libzfs_dataset.c
module/zfs/arc.c
module/zfs/dmu_objset.c
module/zfs/dsl_pool.c
module/zfs/spa.c
module/zfs/zfs_ioctl.c
2009-07-02 16:55:22 -07:00
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
5a2a5d64a5
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
2009-07-02 16:51:09 -07:00
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
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
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
9babb37438
Rebase master to b117
2009-07-02 15:44:48 -07:00
9fd939766f
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-07-01 11:11:12 -07:00
ef0a712858
Distro friendly build system / packaging improvements.
...
These changes bring the zfs-0.4.4 tree in to compliance with
the spl-0.4.4 packaging changes. The bottom line is 2 source
rpms and 4 binary rpms will now be generated when creating
packages there will be:
zfs-<version>.src.rpm
- Fully rebuildable source rpm for libzfs and utils.
zfs-modules-<version>.src.rpm
- Fully rebuildable source rpm for kernel modules.
zfs-<version>.<arch>.rpm
- Binary rpm for libzfs and utils. The utils in this package are
compatible with all zfs-module rpms of the same version.
zfs-devel-<version>.<arch>.rpm
- Binary rpm containing headers for building against libzfs libraries.
zfs-modules-<verion>-<kernel>.arch.rpm
- Binary rpm containing the kernel modules for a specific kernel build.
The package name contains the kernel version and you should have one
of these packages installed to match every kernel on your system.
zfs-modules-devel-<verion>-<kernel>.arch.rpm
- Binary rpm containing development header and module symbols needed
for building additional kernel modules which are dependent on the
zfs module stack.
Expect minor interations on these changes as I validate they work
properly on CHAOS, RHEL, Fedora, and SLES style distros.
2009-07-01 10:53:05 -07:00
18ee78c902
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-03-19 21:31:27 -07:00
bd1685ee4e
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-19 21:28:51 -07:00
1769e10f17
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2009-03-19 21:28:50 -07:00
6d883d7d40
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
2009-03-19 21:28:48 -07:00
fed604c844
Add extra () requested by gcc
2009-03-19 21:18:54 -07:00
c141f3113e
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-03-19 21:11:11 -07:00
e7f02d3b41
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-19 20:59:33 -07:00
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
f180959bac
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
2009-03-19 20:51:18 -07:00
29703a5b4e
Add 'feature-commit-cb' branch for DMU commit callbacks.
2009-03-19 20:30:14 -07:00
cd670610b9
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-03-19 15:31:18 -07:00
db3436fafe
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-19 15:29:35 -07:00
2518c98d9e
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2009-03-19 15:29:34 -07:00
c8c4948d00
Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch
2009-03-19 15:29:33 -07:00
60d25f4b93
The patch resolves the extra call to dnode_cons() in dnode_create().
...
The extra call to the constructor was there to reinitialize the non-
trivial primatives in the dnode (lists, mutexs, condvars, avl tree, etc).
This was safe, although not exactly clean, on Solaris because none of
the primitives allocate memory. In the Linux port this is not true.
To keep stack usage to a minimum several of the primatives dynamically
allocate memory thus initializing them twice results in a memory leak.
This patch resolves this problem for Solaris and Linux by ensuring all
*_inits are called in the constructor, and all *_destroys are called
in the destructor. Additionally we ensure that all dnode objects are
properly deconstructed before being freed to the slab, and when the
objects are allocated from the slab all required data members are
explicity initialized to correct values.
2009-03-19 15:22:48 -07:00
d9fc3ce99d
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-03-19 15:09:09 -07:00
90bbbd109b
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-19 15:07:19 -07:00
f07d61a8c1
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2009-03-19 15:07:18 -07:00
cc032b6337
Merge branch 'fix-list' into refs/top-bases/fix-branch
2009-03-19 15:07:16 -07:00
9bbf8f1761
Resolve conflict with fix-dnode-cons
2009-03-19 15:02:05 -07:00
1b8777474b
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-03-16 16:21:49 -07:00
df985d53db
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-16 16:17:57 -07:00
Brian Behlendorf
Ricardo M. Correia