48bd88f014
Update gcc-c90
...
Additional c90 fixes required due to ZFS update, these include fixing new
places c99 specific things have been done and some cleanup of old usage.
2010-06-14 15:15:26 -07:00
112c20eb8b
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2010-06-14 14:44:57 -07:00
09c1313761
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-06-14 14:44:09 -07:00
47e0108ff6
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-06-14 14:43:39 -07:00
4152507366
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-06-14 14:43:02 -07:00
bdf5763c0a
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-06-14 14:42:58 -07:00
9f9a451561
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2010-06-14 14:42:57 -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
98c6ae53c8
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2010-05-28 22:25:41 -07:00
a054b40984
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
...
Conflicts:
cmd/zpool/zpool_main.c
2010-05-28 22:20:07 -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
8c67d72771
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
...
Conflicts:
cmd/zpool/zpool_main.c
cmd/zpool/zpool_vdev.c
lib/libzfs/libzfs_dataset.c
lib/libzfs/libzfs_import.c
lib/libzfs/libzfs_mount.c
lib/libzfs/libzfs_pool.c
2010-05-28 21:41:17 -07:00
812761eac5
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
...
Conflicts:
cmd/ztest/ztest.c
2010-05-28 15:46:10 -07:00
e27754d9e8
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
...
Conflicts:
cmd/ztest/ztest.c
lib/libzfs/libzfs_sendrecv.c
module/zfs/dmu_objset.c
module/zfs/dnode.c
module/zfs/dnode_sync.c
module/zfs/dsl_dataset.c
module/zfs/include/sys/dmu_tx.h
module/zfs/include/sys/txg.h
module/zfs/spa_history.c
2010-05-28 15:45:38 -07:00
d8f9623833
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
...
Conflicts:
cmd/zdb/zdb_il.c
2010-05-28 15:38:05 -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
cd47feb3c8
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
...
Conflicts:
cmd/zpool/zpool_main.c
cmd/ztest/ztest.c
module/zfs/arc.c
2010-05-28 14:56:00 -07:00
abfb2a3e1d
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
...
Conflicts:
lib/libzfs/libzfs_changelist.c
module/zfs/spa.c
module/zfs/zfs_ioctl.c
2010-05-28 14:49:40 -07:00
3571832262
Merge commit 'refs/top-bases/gcc-missing-braces' into gcc-missing-braces
...
Conflicts:
cmd/zdb/zdb.c
cmd/ztest/ztest.c
lib/libzfs/libzfs_dataset.c
lib/libzfs/libzfs_pool.c
lib/libzfs/libzfs_sendrecv.c
2010-05-28 14:46:39 -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
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
31630287ca
Merge branch 'fix-dbuf_dirty_record_t' into refs/top-bases/fix-branch
...
Conflicts:
lib/libzfs/libzfs_sendrecv.c
module/zfs/dmu_objset.c
module/zfs/dnode.c
module/zfs/dsl_dataset.c
module/zfs/spa_history.c
2010-05-28 13:51:29 -07:00
428870ff73
Update core ZFS code from build 121 to build 141.
2010-05-28 13:45:14 -07:00
37ecc84897
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2010-05-27 16:24:01 -07:00
0d354b53b6
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-05-27 16:22:55 -07:00
b23468df87
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-05-27 16:22:13 -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
4e00654d55
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2010-05-27 13:53:16 -07:00
64c35deecd
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-05-27 13:52:02 -07:00
9a6d4c547a
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-05-27 13:51:51 -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
4b3317d13f
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2010-05-27 13:37:44 -07:00
c886f405ea
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-05-27 13:37:28 -07:00
9f83c4b546
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
...
Conflicts:
lib/libzpool/kernel.c
2010-05-27 13:36:18 -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
343bcf823f
Refresh autogen products with automake 1.11.1
2010-05-21 16:04:53 -07:00
e3a272f273
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2010-05-21 15:37:10 -07:00
542052314e
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
2010-05-21 15:35:53 -07:00
1573fc9932
Cast to (const time_t *) to fix compiler type warning.
2010-05-21 15:06:25 -07:00
3193647679
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2010-05-21 10:51:52 -07:00
14152c7b2c
Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch
2010-05-21 10:49:47 -07:00
868e5de066
Add linux-user-util topic branch.
...
This topic branch contains required changes to the user space
utilities to allow them to integrate cleanly with Linux.
2010-05-21 10:47:59 -07:00
13ed2ef931
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2010-05-21 10:44:31 -07:00
3b79eba6d7
Merge branch 'linux-debug-zerocopy' into refs/top-bases/linux-zfs-branch
2010-05-21 10:44:28 -07:00
a876892309
Revert user space changes from linux-kernel-module topic branch.
...
These changes do not belong on linux-kernel-module since they
are tweaks to user space utilities. I'm reverting them from
this topic branch and will be moving them to a new topic branch
which can be used for just this sort of thing.
2010-05-21 10:40:09 -07:00
8f44115907
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2010-05-18 14:23:10 -07:00
630ce17804
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-05-18 14:23:08 -07:00
86f961b310
Update all zpios related headers for consistency and correctness.
2010-05-18 14:18:09 -07:00
6e06d537fe
Refresh autogen products
2010-05-14 13:36:31 -07:00
d6f1f21cae
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-05-14 13:31:27 -07:00
66c45ef1f4
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2010-05-14 12:59:08 -07:00
feb723fa7d
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
2010-05-14 12:55:10 -07:00
474981ffac
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-05-14 12:54:50 -07:00
bbfb1eeb4c
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-05-14 12:54:23 -07:00
9d8124099b
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-05-14 12:54:14 -07:00
7d30d5032a
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2010-05-14 12:53:12 -07:00
97d19a5e45
Add linux-events topic branch for zevent handling.
...
This topic branch leverages the Solaris style FMA call points
in ZFS to create a user space visible event notification system
under Linux. This new system is called zevent and it unifies
all previous Solaris style ereports and sysevent notifications.
Under this Linux specific scheme when a sysevent or ereport event
occurs an nvlist describing the event is created which looks almost
exactly like a Solaris ereport. These events are queued up in the
kernel when they occur and conditionally logged to the console.
It is then up to a user space application to consume the events
and do whatever it likes with them.
To make this possible the existing /dev/zfs ABI has been extended
with two new ioctls which behave as follows.
* ZFS_IOC_EVENTS_NEXT
Get the next pending event. The kernel will keep track of the last
event consumed by the file descriptor and provide the next one if
available. If no new events are available the ioctl() will block
waiting for the next event. This ioctl may also be called in a
non-blocking mode by setting zc.zc_guid = ZEVENT_NONBLOCK. In the
non-blocking case if no events are available ENOENT will be returned.
It is possible that ESHUTDOWN will be returned if the ioctl() is
called while module unloading is in progress. And finally ENOMEM
may occur if the provided nvlist buffer is not large enough to
contain the entire event.
* ZFS_IOC_EVENTS_CLEAR
Clear are events queued by the kernel. The kernel will keep a fairly
large number of recent events queued, use this ioctl to clear the
in kernel list. This will effect all user space processes consuming
events.
The zpool command has been extended to use this events ABI with the
'events' subcommand. You may run 'zpool events -v' to output a
verbose log of all recent events. This is very similar to the
Solaris 'fmdump -ev' command with the key difference being it also
includes what would be considered sysevents under Solaris. You
may also run in follow mode with the '-f' option. To clear the
in kernel event queue use the '-c' option.
$ sudo cmd/zpool/zpool events -fv
TIME CLASS
May 13 2010 16:31:15.777711000 ereport.fs.zfs.config.sync
class = "ereport.fs.zfs.config.sync"
ena = 0x40982b7897700001
detector = (embedded nvlist)
version = 0x0
scheme = "zfs"
pool = 0xed976600de75dfa6
(end detector)
time = 0x4bec8bc3 0x2e5aed98
pool = "zpios"
pool_guid = 0xed976600de75dfa6
pool_context = 0x0
While the 'zpool events' command is handy for interactive debugging
it is not expected to be the primary consumer of zevents. This ABI
was primarily added to facilitate the addition of a user space
monitoring daemon. This daemon would consume all events posted by
the kernel and based on the type of event perform an action. For
most events simply forwarding them on to syslog is likely enough.
But this interface also cleanly allows for more sophisticated
actions to be taken such as generating an email for a failed drive
2010-05-14 12:40:44 -07:00
98d5d8bd50
Add missing include path for FMA aware zpool command.
2010-05-14 11:57:48 -07:00
7b34c839f9
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2010-04-23 11:09:04 -07:00
66b756d253
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-04-23 11:09:00 -07:00
aafdbe5d6e
Check all partitions with check_file() even when no libblkid is found
...
When creating a new pool on a block device we need to check all the
partitions even if we don't have liblkdid support. In this case
we can't consult the blkid cache but we still can call check_file()
and attempt to read a valid label from each partition.
Additionally, the O_EXCL flag was removed because the device will
be opened multiple times and this was causing the check the file.
The device is only opened read-only anyway so this is still safe.
$ sudo zpool create tank /dev/sdz
invalid vdev specification
use '-f' to override the following errors:
/dev/sdz1 is part of potentially active pool 'tank'
2010-04-23 10:59:31 -07:00
34edbcd956
Refresh autogen products
2010-03-26 15:57:19 -07:00
ddb2e7a5c5
Refresh autogen products
2010-03-22 17:01:13 -07:00
c3240ea0d8
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2010-03-09 12:31:56 -08:00
41844740dc
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-03-09 12:31:46 -08:00
3ea63f0cdb
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-03-09 12:31:25 -08:00
4b2b113239
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-03-09 12:31:18 -08:00
17a96f44f3
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-03-09 12:30:43 -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
02d15b4e4f
Refresh autogen products
2010-03-08 10:57:16 -08:00
98ae569641
Refresh autogen products
2010-03-02 10:17:58 -08:00
cdc2e52139
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
...
Conflicts:
scripts/udev-rules/99-zpool.rules.dragon
2010-03-02 10:08:59 -08:00
691a79e619
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-03-02 10:07:08 -08:00
06d354b4f3
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
...
Conflicts:
cmd/Makefile.am
2010-03-02 10:06:26 -08:00
44d8092c2c
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-03-02 10:05:09 -08:00
5455070ca1
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-03-02 10:04:12 -08:00
e6d92ae57d
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
...
Conflicts:
cmd/Makefile.am
2010-03-02 10:01:51 -08:00
7df02c0f57
Split the udev rule from a specific configuration
...
While I completely agree the udev is the lesser of many possibles
evils when solving the device issue... it is still evil. After
attempting to craft a single rule which will work for various
versions of udev in various distros. I've come to the conclusion
the only maintainable way to solve this issue is to split the rule
from any particular configuration.
This commit provides a generic 60-zpool.rules file which use a
small helper util 'zpool_id' to parse a configuration file by
default located in /etc/zfs/zdev.conf. The helper script maps
a by-path udev name to a more friendly name of <channel><rank>
for large configurations.
As part of this change all of the support scripts why rely on
this udev naming convention have been updated as needed. Example
zdev.conf files have also been added for 3 different systems by
you will always need to add one for your exact hardware.
Finally, included in these changes are the proper tweaks to the
build system to ensure everything still get's packaged properly
in the rpms and can run in or out of tree.
2010-03-01 16:51:21 -08:00
5786166a86
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2010-01-08 11:40:38 -08:00
6c1f5a126c
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-01-08 11:40:31 -08:00
2ebee09b55
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-01-08 11:40:19 -08:00
Brian Behlendorf