03bc0d94a2
Merge commit 'refs/top-bases/gcc-missing-braces' into gcc-missing-braces
2010-04-29 12:03:53 -07:00
ff1883382e
Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas
2010-04-29 12:03:50 -07:00
6edb312559
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
2010-04-29 12:03:45 -07:00
3b12e5a66a
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
2010-04-29 12:03:42 -07:00
0ef388e9bb
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
2010-04-29 12:03:39 -07:00
75d373f38d
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
2010-04-29 12:03:36 -07:00
f90ac4206e
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
2010-04-29 12:03:32 -07:00
e366632a94
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
2010-04-29 12:03:29 -07:00
b3b5351af0
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
2010-04-29 12:03:20 -07:00
8279f80885
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2010-04-29 12:03:18 -07:00
c708851b13
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2010-04-29 12:03:17 -07:00
3affbe6d7e
Update nvpair's to include nv_alloc_fixed support
2010-04-29 11:59:41 -07:00
c9ae4b9808
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-04-29 11:00:46 -07:00
8535236dca
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2010-04-29 11:00:45 -07:00
72de3a8ee1
Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch
2010-04-29 11:00:44 -07:00
151f424dd8
Strip ident pragma from module/zfs/include/sys/fm/util.h
2010-04-29 10:57:17 -07:00
4d5d0f9ef5
Include FMA source and headers in build system
2010-04-29 10:55:27 -07:00
1368594e11
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-04-29 10:41:59 -07:00
ca4ad9f284
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
2010-04-29 10:41:56 -07:00
9199dc112a
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2010-04-29 10:41:55 -07:00
c97d2c5541
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
2010-04-29 10:41:53 -07:00
18f485a504
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2010-04-29 10:41:52 -07:00
655b4b2b1c
Merge commit 'refs/top-bases/fix-taskq' into fix-taskq
2010-04-29 10:41:39 -07:00
dbda9cb8fc
Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t
2010-04-29 10:41:28 -07:00
86049947d8
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
2010-04-29 10:41:24 -07:00
13668b7879
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
2010-04-29 10:41:23 -07:00
f2ca1d7334
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
2010-04-29 10:41:22 -07:00
34d62da9bc
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2010-04-29 10:41:18 -07:00
986366989f
Merge commit 'refs/top-bases/gcc-missing-braces' into gcc-missing-braces
2010-04-29 10:41:12 -07:00
d91c81c4df
Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas
2010-04-29 10:41:09 -07:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Brian Behlendorf
Ricardo M. Correia