058a25a017
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-08 15:00:43 -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
b12e8eb702
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-07-08 09:20:37 -07:00
cfa46b4440
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-07-08 09:19:57 -07:00
78b1d31076
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-07-08 09:19:44 -07:00
1355255010
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-07-08 09:17:52 -07:00
cca71cc88b
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-07-08 09:17:00 -07:00
1182c9a9d1
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-07-08 09:16:47 -07:00
affa4ec536
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-07-08 09:16:10 -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
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
5534447477
Add explicit casts for (u_longlong_t) when printing uint64_t.
2009-07-08 09:06:03 -07:00
b2dcbdf490
Resolve a 2 new cases of for loop variable declared in for()
2009-07-08 09:04:21 -07:00
20989cd4f2
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-07-06 17:01:43 -07:00
621679fec6
Update to use dmu_read() instead of dmu_read_impl() now that a 'flags'
...
argument is available. This flags argument was added to allow a clean
API for disabling prefetch, so I'll update zpios to use it in preference
to the module option hack used before.
2009-07-06 16:51:59 -07:00
53247399a0
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-07-06 15:42:24 -07:00
684a4c5f30
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-07-06 15:41:50 -07:00
f90e398526
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-07-06 15:41:37 -07:00
ba95b1816a
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-07-06 15:40:13 -07:00
d895de5ecb
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-07-06 15:39:35 -07:00
093f510c09
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-07-06 15:39:24 -07:00
acd330cad6
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-07-06 15:38:55 -07:00
69b2257940
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-06 15:38:51 -07:00
8463b9e01e
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2009-07-06 15:38:50 -07:00
3a8e684d73
Additional lock calls were added to ztest and they must be updated
...
to use the pthread's API in favour of Solaris threads.
2009-07-06 15:31:54 -07:00
a6b1465e30
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
...
Conflicts:
module/zfs/include/sys/zfs_fuid.h
module/zfs/zfs_fuid.c
module/zfs/zfs_ioctl.c
module/zfs/zfs_vfsops.c
module/zfs/zfs_znode.c
2009-07-06 15:16:54 -07:00
d65102b493
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-07-06 15:08:57 -07:00
409cfe5051
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
...
Conflicts:
lib/libzfs/libzfs_pool.c
2009-07-06 15:05:47 -07:00
266a7d8cd7
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
...
Conflicts:
module/zcommon/zfs_namecheck.c
module/zfs/spa.c
module/zfs/vdev.c
module/zfs/zap_micro.c
2009-07-06 13:47:04 -07:00
053043b2d0
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
...
Conflicts:
lib/libzfs/libzfs_pool.c
2009-07-06 13:44:19 -07:00
a33c6c25d2
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-07-06 13:43:22 -07:00
149c4b2731
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
...
Conflicts:
cmd/ztest/ztest.c
lib/libzfs/libzfs_pool.c
module/zcommon/zfs_namecheck.c
module/zfs/dmu.c
module/zfs/include/sys/dmu.h
module/zfs/include/sys/zfs_fuid.h
module/zfs/spa.c
module/zfs/vdev.c
module/zfs/zap_micro.c
module/zfs/zfs_fuid.c
module/zfs/zfs_ioctl.c
module/zfs/zfs_vfsops.c
module/zfs/zfs_znode.c
2009-07-06 13:40:29 -07:00
658459249e
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-06 13:17:28 -07:00
926b04acba
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
...
Conflicts:
cmd/ztest/ztest.c
2009-07-06 13:17:16 -07:00
cd098f87c8
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
...
Conflicts:
cmd/ztest/ztest.c
2009-07-06 13:16:29 -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
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
dbaf4f6c0f
Merge commit 'refs/top-bases/gcc-fortify-source' into gcc-fortify-source
...
Conflicts:
cmd/ztest/ztest.c
2009-07-02 17:08:30 -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
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
2a744e0bbb
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-05-22 16:38:43 -07:00
2384f8a72f
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-05-22 16:38:21 -07:00
4e048c65aa
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-05-22 16:38:14 -07:00
40e75795ca
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-05-22 16:37:19 -07:00
4a2266c1d5
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-05-22 16:36:53 -07:00
300575508d
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-05-22 16:36:45 -07:00
5451ee79e5
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-05-22 16:36:26 -07:00
e1d6e67473
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-05-22 16:36:23 -07:00
9c53917bd5
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-05-22 16:36:23 -07:00
e56aa929e8
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
2009-05-22 16:36:22 -07:00
8e9605062a
Explictly use signed char for portability. On x86/x86_64
...
systems the default char type is signed, on ppc/ppc64 systems
the default char type is unsigned.
2009-05-22 16:30:47 -07:00
d24362e80b
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-03-20 09:33:38 -07:00
fa58082158
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-03-20 09:33:01 -07:00
0826ebc008
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-03-20 09:32:50 -07:00
dddcb5433e
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-03-20 09:31:02 -07:00
dd585763ef
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-03-20 09:30:16 -07:00
daab277117
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-03-20 09:30:03 -07:00
1b2503a433
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-03-20 09:29:26 -07:00
f53e5a851d
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-20 09:29:22 -07:00
0c88bc3ccd
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2009-03-20 09:29:21 -07:00
13814fe220
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
2009-03-20 09:29:16 -07:00
99da5f93e8
Fix uninitialized variable error in ztest_dmu_commit_callbacks()
2009-03-20 09:20:49 -07:00
f764039e87
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-03-19 21:32:26 -07:00
aee87a5ab6
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-03-19 21:31:54 -07:00
6756c613c1
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-03-19 21:31:38 -07:00
61914d7403
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-03-19 21:30:15 -07:00
ea8c53f9e1
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-03-19 21:29:37 -07:00
1b88587905
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-03-19 21:29:26 -07:00
56d18263ed
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-03-19 21:28:54 -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
63781842e3
Update mutex_lock to pthread_mutex_lock for zcl->zcl_callback_locks.
2009-03-19 21:21:35 -07:00
4f2dfa3c94
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-03-19 21:13:11 -07:00
665c272091
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-03-19 21:11:35 -07:00
a676a29d25
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-03-19 21:11:25 -07:00
275f4aae5d
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
...
Conflicts:
module/zfs/dmu_tx.c
2009-03-19 21:08:17 -07:00
0bdc8e0aec
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-03-19 21:06:46 -07:00
376a68e404
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-03-19 21:06:35 -07:00
7f33364d3c
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
...
Conflicts:
lib/libzpool/include/sys/zfs_context.h
module/zfs/dmu_tx.c
module/zfs/txg.c
2009-03-19 21:03:58 -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
54b5b41a58
Add 'feature-pthreads' branch to features branch.
2009-03-19 20:49:52 -07:00
29703a5b4e
Add 'feature-commit-cb' branch for DMU commit callbacks.
2009-03-19 20:30:14 -07:00
7a87dfebb8
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-03-19 19:58:30 -07:00
d9fd92c850
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-03-19 19:57:26 -07:00
240445807b
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-03-19 19:57:13 -07:00
dabea57f25
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-03-19 19:55:49 -07:00
bd2293fdb1
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-03-19 19:55:03 -07:00
1d2e8df03f
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-03-19 19:54:53 -07:00
5e5d31f105
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
...
Conflicts:
lib/libzpool/include/sys/zfs_context.h
2009-03-19 19:52:21 -07:00
8c43ad3853
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-19 19:49:56 -07:00
8cdcf1ef44
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2009-03-19 19:49:55 -07:00
05cec154f5
Merge branch 'fix-pthreads' into refs/top-bases/fix-branch
2009-03-19 19:49:53 -07:00
53db4c7b29
Revert fix-pthreads moving to feature-pthreads branch
2009-03-19 19:43:09 -07:00
1eb357eeb1
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-03-18 14:40:02 -07:00
b46037b53f
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-03-18 14:39:07 -07:00
c7cc10351e
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-03-18 14:38:48 -07:00
5b5d766544
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-03-18 14:34:25 -07:00
3f05b34895
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-03-18 14:33:06 -07:00
c0a760420e
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-03-18 14:32:47 -07:00
c6ddce0341
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-03-18 14:31:53 -07:00
70407622a7
Move `make check` ztest under ./scripts where the module stack is loaded.
2009-03-18 14:19:04 -07:00
6ca96b06b4
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-03-18 13:03:00 -07:00
cc4fbf2c35
Revert to previous behavior zdb fails when unable to open /dev/zfs.
...
For the moment I have added an error message to the failure path to
make it clear what happened. I have also changed the zdb ASSERT to
a VERIFY so we always catch the failure. For now we will just always
ensure the module stack is loaded, longer term we need something a
little more flexible.
2009-03-18 12:48:54 -07:00
af0afd9ce3
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
2009-03-16 11:24:10 -07:00
53edd221ff
Pull unused get_one_dataset() under HAVE_ZPL ifdef.
2009-03-16 11:14:19 -07:00
cddaf29902
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-03-16 10:43:19 -07:00
754431f4db
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-03-16 10:42:43 -07:00
10e245f03f
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
...
Conflicts:
cmd/zpool/zpool_main.c
2009-03-16 10:42:20 -07:00
e98228ab73
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-03-16 10:39:08 -07:00
dbbb5c2e4e
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-03-16 10:38:52 -07:00
c9cff73d9e
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
...
Conflicts:
cmd/zpool/zpool_main.c
2009-03-16 10:32:12 -07:00
be112b3f57
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-16 10:30:31 -07:00
5ee8a85ba6
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2009-03-16 10:30:27 -07:00
9818e69640
Merge branch 'fix-deadcode' into refs/top-bases/fix-branch
2009-03-16 10:12:01 -07:00
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
93643c487f
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2009-03-12 15:54:13 -07:00
c7979c6f55
Check realpath() return code.
2009-03-12 15:49:23 -07:00
71bc2e8c03
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-03-12 15:47:36 -07:00
59edc6fb4e
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-03-12 15:47:27 -07:00
2a21321766
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-03-12 15:46:56 -07:00
c399ce1af8
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-03-12 15:46:45 -07:00
9e4850e3d1
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-03-12 15:44:54 -07:00
65d5ab8f56
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-03-12 15:44:42 -07:00
5a7e7e9d3b
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-03-12 15:44:18 -07:00
82ce8b00f3
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-12 15:44:14 -07:00
6a5acaa105
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-03-12 15:44:13 -07:00
9fe5b916e2
Merge branch 'gcc-fortify-source' into refs/top-bases/gcc-branch
2009-03-12 15:39:27 -07:00
9e49df6b20
Add gcc-fortify-source branch
2009-03-12 15:38:51 -07:00
98e7b9f354
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-03-12 10:41:02 -07:00
bb06faa046
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-03-12 10:40:54 -07:00
58e63ca4cc
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-03-12 10:40:17 -07:00
fbbb5fe669
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-03-12 10:40:09 -07:00
45f3d2a2a4
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-03-12 10:38:05 -07:00
5f9ae91a8a
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-03-12 10:37:50 -07:00
9bdbd7c8f7
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-03-12 10:37:18 -07:00
b9b399bf04
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-12 10:37:14 -07:00
a03187bb3b
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-03-12 10:37:12 -07:00
f8fe8a76f4
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
2009-03-12 10:37:11 -07:00
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
8da25a0948
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-03-12 10:03:39 -07:00
a59f378c54
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-03-12 10:03:31 -07:00
308903afa4
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-03-12 10:02:53 -07:00
77695eacc1
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-03-12 10:02:45 -07:00
dcc25c44da
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-03-12 10:00:48 -07:00
8e56c7350f
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-03-12 10:00:38 -07:00
0cdc14e427
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-03-12 10:00:07 -07:00
dd30dba016
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-12 10:00:04 -07:00
193ea156e9
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-03-12 10:00:03 -07:00
eceaf813ad
Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch
2009-03-12 10:00:01 -07:00
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
396b45acc8
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-03-12 09:27:52 -07:00
4f216a686e
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-03-12 09:27:43 -07:00
b1687e86ec
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-03-12 09:27:13 -07:00
9bee4c8c52
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-03-12 09:27:04 -07:00
13742b3b80
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-03-12 09:25:14 -07:00
cb931a10ff
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-03-12 09:25:05 -07:00
308a05919a
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-03-12 09:24:35 -07:00
2e9568b6be
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-12 09:24:32 -07:00
fba88e48f2
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2009-03-12 09:24:31 -07:00
9de6723b83
ztest_resume should be ztest_resume_thread in pthread_create()
...
Fix an accidental bug introducted by the pthreads changes. When creating
a resume thread the handler function was accidentally changed from
ztest_resume to ztest_resume_thread. There's a decent chance this
may explain some/all of the crashes that have be observed running
ztest. This issue was exposed and easily fixed once the -Wno-unused
check was removed from the build system. Happily at least one real
bug fix resulted from that cleanup.
2009-03-12 09:13:40 -07:00
da4d2eea9d
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
2009-03-11 23:10:06 -07:00
73db9f622c
Pull unused err variable under HAVE_DM_INUSE_SWAP ifdef.
2009-03-11 23:05:42 -07:00
06fd9e48a0
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
2009-03-11 23:00:04 -07:00
8aac8753f4
Move 4 unused functions under HAVE_ZPL until implemented.
2009-03-11 22:55:45 -07:00
0d19b2613b
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
2009-03-11 22:50:31 -07:00
1c0279a08f
Resolve newly revealed unused vars and symbols caused by topic branch.
2009-03-11 22:43:09 -07:00
3a9f66d280
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-03-11 22:29:58 -07:00
071662bf32
Remove unused variable
2009-03-11 22:14:08 -07:00
1fcdd63cc6
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-03-11 21:03:21 -07:00
cb52b25a43
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-03-11 21:03:09 -07:00
9326966d34
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-03-11 21:02:37 -07:00
b392fd33fd
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-03-11 21:02:27 -07:00
9c4cc2ae78
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-03-11 21:00:25 -07:00
87094b528c
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-03-11 21:00:16 -07:00
c351352990
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-03-11 20:59:46 -07:00
4c042de40b
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-11 20:59:43 -07:00
60ac8152fe
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-03-11 20:59:42 -07:00
9915249546
Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch
2009-03-11 20:53:11 -07:00
d4dbc7dca8
Resolve all instances of missing braces.
2009-03-11 20:52:21 -07:00
fa2e001fe3
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-03-11 14:13:47 -07:00
b2041bc8ef
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-03-11 14:13:33 -07:00
bd92e256e6
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-03-11 14:12:52 -07:00
330dbde81a
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-03-11 14:12:39 -07:00
cac68bc478
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-03-11 14:09:49 -07:00
0f0abc8d58
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-03-11 14:09:36 -07:00
5afc3db3ce
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-03-11 14:08:57 -07:00
1ca6578ebc
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-11 14:08:51 -07:00
8a3b1a5ff5
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-03-11 14:08:50 -07:00
e5011401cd
Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch
2009-03-11 14:08:48 -07:00
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
e77e7b4dc3
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-03-11 11:22:35 -07:00
af12291488
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
...
Conflicts:
module/zfs/rrwlock.c
module/zfs/zfs_replay.c
2009-03-11 11:22:11 -07:00
a55824aa6a
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-03-11 11:20:15 -07:00
261ca2beb9
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-03-11 11:19:58 -07:00
47e0037a8b
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-03-11 11:15:59 -07:00
bc22a004ee
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-03-11 11:15:40 -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
ab3f1d72e8
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-03-11 10:45:02 -07:00
2ff4ee3cae
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-03-11 10:44:51 -07:00
2d756b5ea3
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-03-11 10:44:10 -07:00
2be3b720b9
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-03-11 10:43:59 -07:00
e42874df99
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-03-11 10:41:25 -07:00
762bbd3368
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-03-11 10:41:10 -07:00
73c738d1ce
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-03-11 10:40:37 -07:00
8eaf19dae8
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-11 10:40:33 -07:00
d43e9ca262
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-03-11 10:40:31 -07:00
d641369d38
Merge branch 'gcc-64bit-constants' into refs/top-bases/gcc-branch
2009-03-11 10:32:45 -07:00
fd9a7a0fb4
Add 'ull' suffix to 64-bit constants.
2009-03-11 10:31:24 -07:00
29946892d9
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-02-19 14:57:29 -08:00
ddfa570f42
Initial update to support zpios.sh profiling option.
2009-02-19 14:51:40 -08:00
023a02025f
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-02-19 13:58:27 -08:00
5ae73585fb
Cleanup zpios option handling
2009-02-19 13:53:17 -08:00
d3f070026f
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-02-19 13:02:01 -08:00
23710f1308
Minor zpios cleanup plus addition of --nowait feature
2009-02-19 12:56:50 -08:00
3bef977501
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-02-18 14:38:45 -08:00
7b8eca908f
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
...
Conflicts:
cmd/zpool/zpool_main.c
2009-02-18 14:38:20 -08:00
b3d7657ea0
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-02-18 14:37:01 -08:00
437bc77985
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-02-18 14:36:49 -08:00
f78c15d84f
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-02-18 14:34:03 -08:00
7e21796d7e
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-02-18 14:33:48 -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
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
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
6cb1ac2d49
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-02-13 12:19:24 -08:00
68346c54fe
Misnamed --load option sff changed to ssf
2009-02-13 12:07:34 -08:00
4f715bee61
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-01-15 15:56:30 -08:00
b53602e7c0
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-01-15 15:56:25 -08:00
4144f1ed75
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-01-15 15:56:09 -08:00
941807d6be
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-01-15 15:56:04 -08:00
f21c45793f
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-01-15 15:54:58 -08:00
Brian Behlendorf
Ricardo M. Correia