993fa8c15c
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
2010-06-14 15:36:59 -07:00
b41463f5e8
Update gcc-invalid-prototypes
...
Fix new invalid prototypes, typically just a missing void arg.
2010-06-14 15:25:49 -07:00
0a8593375e
Update gcc-missing-case
...
Fix new locations of an incomplete case statement.
2010-06-14 15:19:09 -07:00
09c1313761
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-06-14 14:44:09 -07:00
4152507366
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-06-14 14:43:02 -07:00
fc490c18b6
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
2010-06-14 14:42:56 -07:00
dd8f6da3da
Update gcc-cast
...
Fix new instances of missing casts or assumed types.
2010-06-14 14:40:10 -07:00
b41143632b
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
...
Conflicts:
cmd/zpool/zpool_main.c
cmd/zpool/zpool_vdev.c
cmd/ztest/ztest.c
lib/libzfs/libzfs_dataset.c
lib/libzfs/libzfs_import.c
lib/libzfs/libzfs_mount.c
lib/libzfs/libzfs_pool.c
lib/libzfs/libzfs_sendrecv.c
lib/libzpool/include/sys/zfs_context.h
module/zcommon/include/sys/fs/zfs.h
module/zcommon/zfs_comutil.c
module/zfs/arc.c
module/zfs/dmu.c
module/zfs/dmu_objset.c
module/zfs/dmu_send.c
module/zfs/dmu_tx.c
module/zfs/dsl_dataset.c
module/zfs/dsl_dir.c
module/zfs/dsl_scrub.c
module/zfs/fm.c
module/zfs/include/sys/dmu.h
module/zfs/include/sys/fm/fs/zfs.h
module/zfs/include/sys/fm/protocol.h
module/zfs/include/sys/spa.h
module/zfs/include/sys/zfs_context.h
module/zfs/include/sys/zfs_ioctl.h
module/zfs/include/sys/zvol.h
module/zfs/spa.c
module/zfs/spa_boot.c
module/zfs/spa_history.c
module/zfs/spa_misc.c
module/zfs/txg.c
module/zfs/vdev.c
module/zfs/zfs_fm.c
module/zfs/zfs_ioctl.c
module/zfs/zfs_replay.c
module/zfs/zfs_znode.c
module/zfs/zil.c
module/zfs/zio.c
2010-05-28 22:14:39 -07:00
d78690fcd9
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
...
Conflicts:
cmd/ztest/ztest.c
2010-05-28 21:44:27 -07:00
97352d5103
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
...
Conflicts:
cmd/zpool/zpool_main.c
cmd/ztest/ztest.c
2010-05-28 15:37:31 -07:00
3e2be634a5
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
...
Conflicts:
cmd/zdb/zdb.c
cmd/zdb/zdb_il.c
cmd/zfs/zfs_main.c
cmd/zfs/zfs_util.h
cmd/zinject/zinject.h
cmd/zpool/zpool_main.c
cmd/zpool/zpool_util.c
cmd/ztest/ztest.c
lib/libnvpair/include/libnvpair.h
lib/libnvpair/libnvpair.c
lib/libzfs/libzfs_changelist.c
lib/libzfs/libzfs_config.c
lib/libzfs/libzfs_dataset.c
lib/libzfs/libzfs_import.c
lib/libzfs/libzfs_mount.c
lib/libzfs/libzfs_pool.c
lib/libzfs/libzfs_sendrecv.c
module/avl/avl.c
module/avl/include/sys/avl.h
module/nvpair/include/sys/nvpair.h
module/nvpair/nvpair.c
module/zcommon/include/zfs_comutil.h
module/zcommon/include/zfs_prop.h
module/zcommon/zfs_comutil.c
module/zfs/arc.c
module/zfs/dbuf.c
module/zfs/dmu.c
module/zfs/dmu_objset.c
module/zfs/dmu_zfetch.c
module/zfs/dnode_sync.c
module/zfs/dsl_dataset.c
module/zfs/dsl_pool.c
module/zfs/dsl_prop.c
module/zfs/dsl_synctask.c
module/zfs/include/sys/dmu_tx.h
module/zfs/include/sys/dmu_zfetch.h
module/zfs/include/sys/dsl_synctask.h
module/zfs/include/sys/refcount.h
module/zfs/include/sys/txg.h
module/zfs/include/sys/uberblock.h
module/zfs/include/sys/zap_leaf.h
module/zfs/include/sys/zfs_debug.h
module/zfs/include/sys/zfs_znode.h
module/zfs/include/sys/zio_compress.h
module/zfs/include/sys/zvol.h
module/zfs/lzjb.c
module/zfs/metaslab.c
module/zfs/refcount.c
module/zfs/sha256.c
module/zfs/spa.c
module/zfs/spa_boot.c
module/zfs/uberblock.c
module/zfs/vdev.c
module/zfs/zap_micro.c
module/zfs/zfs_ioctl.c
module/zfs/zfs_replay.c
module/zfs/zio.c
module/zfs/zio_compress.c
2010-05-28 15:34:57 -07:00
d60fc5ca30
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
...
Conflicts:
module/zfs/dbuf.c
module/zfs/dmu.c
module/zfs/dmu_objset.c
module/zfs/dnode_sync.c
module/zfs/dsl_dataset.c
module/zfs/dsl_prop.c
module/zfs/metaslab.c
module/zfs/spa.c
module/zfs/vdev.c
module/zfs/zap_micro.c
2010-05-28 15:07:36 -07:00
2591cac812
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
...
Conflicts:
cmd/zdb/zdb_il.c
cmd/ztest/ztest.c
lib/libzfs/libzfs_mount.c
2010-05-28 14:42:40 -07:00
1be88bcba0
Merge commit 'refs/top-bases/gcc-fortify-source' into gcc-fortify-source
...
Conflicts:
cmd/zdb/zdb.c
2010-05-28 14:37:39 -07:00
475bf41d1c
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
...
Conflicts:
cmd/zfs/zfs_main.c
cmd/zpool/zpool_main.c
cmd/ztest/ztest.c
2010-05-28 14:36:18 -07:00
957b7b41d4
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
...
Conflicts:
cmd/zdb/zdb.c
cmd/ztest/ztest.c
module/zfs/dbuf.c
module/zfs/dsl_dataset.c
module/zfs/dsl_scrub.c
module/zfs/spa.c
module/zfs/vdev.c
module/zfs/zio.c
2010-05-28 14:19:22 -07:00
428870ff73
Update core ZFS code from build 121 to build 141.
2010-05-28 13:45:14 -07:00
0d354b53b6
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-05-27 16:22:55 -07:00
a08f4edee7
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-05-27 16:21:20 -07:00
ea431b4dc6
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-05-27 16:14:04 -07:00
319f69734b
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
...
Conflicts:
cmd/ztest/ztest.c
2010-05-27 16:13:19 -07:00
390995db28
Revert all remaining changes.
2010-05-27 14:25:06 -07:00
64c35deecd
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-05-27 13:52:02 -07:00
5cad1e175d
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
...
Conflicts:
module/zfs/dmu_tx.c
module/zfs/txg.c
2010-05-27 13:48:54 -07:00
d8e5eb56b8
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2010-05-27 13:42:00 -07:00
028e42b692
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-05-27 13:42:00 -07:00
cde6e6fec8
Merge commit 'refs/top-bases/feature-branch' into feature-branch
2010-05-27 13:40:15 -07:00
1e32b3c781
Revert feature-commit-cb feature upstream
...
We can drop this feature and we will pick up the lastest version
during the b141 update.
2010-05-27 13:39:17 -07:00
c886f405ea
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-05-27 13:37:28 -07:00
95885a2f68
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
...
Conflicts:
lib/libzpool/include/sys/zfs_context.h
lib/libzpool/kernel.c
2010-05-27 13:35:09 -07:00
c17d3e05eb
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2010-05-27 13:32:58 -07:00
51536ea5f4
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-05-27 13:32:58 -07:00
a082023842
Merge commit 'refs/top-bases/feature-branch' into feature-branch
...
Conflicts:
cmd/ztest/ztest.c
lib/libzpool/include/sys/zfs_context.h
lib/libzpool/kernel.c
lib/libzpool/taskq.c
2010-05-27 13:30:48 -07:00
099e8e493a
Remove feature-pthreads prior to b141 update.
...
The pthreads change will need to be reworked and reapplied.
This will be easier to do from scratch rather than sort out
the merge.
2010-05-27 13:23:58 -07:00
41844740dc
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-03-09 12:31:46 -08:00
573328741b
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
2010-03-09 12:30:21 -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
bc17042a77
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-08-18 12:59:44 -07:00
c67303e092
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
...
Conflicts:
lib/libzfs/libzfs_dataset.c
module/zfs/dsl_dataset.c
module/zfs/rrwlock.c
module/zfs/spa_history.c
module/zfs/zfs_ioctl.c
2009-08-18 12:26:09 -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
b99b422796
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-08-18 12:08:58 -07:00
cadd2ec869
Merge commit 'refs/top-bases/gcc-fortify-source' into gcc-fortify-source
2009-08-18 12:08:52 -07:00
3a37442dc7
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
2009-08-18 12:06:53 -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
9a94206f03
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-08-14 10:26:12 -07:00
feb385e65c
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2009-08-14 10:22:13 -07:00
503a1a983c
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-08-14 10:22:10 -07:00
bd586322cc
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-08-14 10:22:08 -07:00
f9bab26542
Merge branch 'gcc-fortify-source' into refs/top-bases/gcc-branch
2009-08-14 10:22:07 -07:00
e6b541db64
All calls to ftruncate() must have their return code checked.
...
Under FC11 rpm builds by default add the --fortify-source option which
ensures that functions flagged with certain attributes must have their
return codes checked. Normally this is just a warning but we always
build with -Werror so this is fatal. Simply wrap the function in a
verify call to ensure we catch a failure if there is one.
2009-08-14 10:11:03 -07:00
754c2e2025
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-08-04 15:58:52 -07:00
72fc3eca7e
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2009-08-04 15:54:25 -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
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
2f2296bbe5
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-08-04 14:43:42 -07:00
139ca4655e
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2009-08-04 14:39:11 -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
0ebcbe2e74
Revert unneeded ztest_resume() prototype changes to match upstream.
2009-08-04 14:29:50 -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
1b6e81d6a3
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-07-14 14:39:57 -07:00
8121895a61
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-07-14 14:34:44 -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
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
da22b43a13
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-07-09 12:28:45 -07:00
999f693b85
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-07-09 12:23:46 -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
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
88acc774ac
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-07-08 16:12:52 -07:00
963603808d
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-07-08 16:08:18 -07:00
8070ba7bea
Untracked pthread changes which must have accidentally crept in.
...
This is exactly the reason why I want a new topgit command which
takes the base, then incrementally applies all the patches and
compares them againsts what is actually committed. This would
ensure this sort of thing doesn't happen!
2009-07-08 15:58:28 -07:00
2ddc86747d
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-07-08 15:05:32 -07:00
c821af8f89
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-07-08 15:00:48 -07:00
275d66171b
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2009-07-08 15:00:41 -07:00
57ae3b59e9
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
2009-07-08 15:00:39 -07:00
2caba8e240
Add new DMU_READ_PREFETCH flag to dmu_read().
2009-07-08 14:51:55 -07:00
1ab1b8502b
Stop the kthread/thread/pthread mixing and matching insanity. Update all
...
code to only use the kthread API regardless of if it is compiled in the
kernel or user space. The kthread API will be layered on top of pthreads
as best as possible in zfs_context, this is non optimal but much clearer.
2009-07-08 14:47:23 -07:00
b5c5838d48
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-07-08 09:20:50 -07:00
affa4ec536
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-07-08 09:16:10 -07:00
f00e6fe5c3
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-07-08 09:16:04 -07:00
23cff295e2
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
2009-07-08 09:16:02 -07:00
5fc46112cb
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2009-07-08 09:16:01 -07:00
b2e459dab0
Add explicit casts for (u_longlong_t) when printing uint64_t.
2009-07-08 09:07:13 -07:00
b2dcbdf490
Resolve a 2 new cases of for loop variable declared in for()
2009-07-08 09:04:21 -07:00
06a30ede64
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-07-06 15:42:35 -07:00
acd330cad6
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-07-06 15:38:55 -07:00
8463b9e01e
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2009-07-06 15:38:50 -07:00
Brian Behlendorf
Ricardo M. Correia